郑根木 пре 2 година
родитељ
комит
770ca363a4
100 измењених фајлова са 239 додато и 177 уклоњено
  1. +1
    -1
      smtweb-framework/sw-framework-auth/src/main/java/cc/smtweb/framework/auth/web/service/AuthService.java
  2. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/R.java
  3. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwException.java
  4. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwIpAddr.java
  5. +1
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwMap.java
  6. +19
    -5
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java
  7. +1
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java
  8. +1
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/dao/AbstractEntityDao.java
  9. +1
    -4
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/BaseBean.java
  10. +0
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java
  11. +2
    -8
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcEngine.java
  12. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/SwMapPropertyRowMapper.java
  13. +4
    -4
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindBeanException.java
  14. +2
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindParamException.java
  15. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/CacheException.java
  16. +0
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/DbException.java
  17. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/JsonParseException.java
  18. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/config/GlobalExceptionHandler.java
  19. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/MethodAccessManager.java
  20. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/access/MethodAccess.java
  21. +2
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/WebDataBinder.java
  22. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java
  23. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanUtil.java
  24. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java
  25. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/param/AbstractParameterEditor.java
  26. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ScanContext.java
  27. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/realm/exception/AuthorizationException.java
  28. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/AbstractJobExecutor.java
  29. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/SchedulerPoint.java
  30. +3
    -3
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractCompService.java
  31. +1
    -4
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java
  32. +1
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractHandler.java
  33. +2
    -6
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java
  34. +1
    -3
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractLoadHandler.java
  35. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java
  36. +2
    -11
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractTreeHandler.java
  37. +3
    -3
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultComboHandler.java
  38. +0
    -4
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultDelHandler.java
  39. +1
    -4
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultListHandler.java
  40. +1
    -10
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultProvider.java
  41. +8
    -3
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java
  42. +2
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/IHandler.java
  43. +1
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java
  44. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java
  45. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java
  46. +18
    -0
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/ICalcVar.java
  47. +26
    -0
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariable.java
  48. +44
    -0
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariableFactory.java
  49. +1
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/redis/RedisManager.java
  50. +0
    -2
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/CommUtil.java
  51. +1
    -4
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java
  52. +1
    -1
      smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/MapUtil.java
  53. +1
    -2
      smtweb-framework/sw-framework-core/src/test/java/cc/smtweb/framework/test/DaoTransTest.java
  54. +1
    -1
      smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/controller/FileUploadController.java
  55. +0
    -1
      smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/dao/ImageAttachDao.java
  56. +1
    -1
      smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoDbService.java
  57. +1
    -1
      smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoTimerService.java
  58. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/exception/BpmException.java
  59. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmListData.java
  60. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmPageContext.java
  61. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmBeanAttrEditor.java
  62. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmMapAttrEditor.java
  63. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmPageContextEditor.java
  64. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardDataBuilder.java
  65. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/TreeDataBuilder.java
  66. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/entity/form/BpmWidget.java
  67. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/AbstractDatasetAgent.java
  68. +2
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/AbstractDatasetCardService.java
  69. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/DatasetCardWorker.java
  70. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetLoadAgent.java
  71. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetSaveAgent.java
  72. +2
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/AbstractDatasetListService.java
  73. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/DatasetListWorker.java
  74. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetCountAgent.java
  75. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetListAgent.java
  76. +2
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/AbstractDatasetTreeService.java
  77. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/DatasetTreeWorker.java
  78. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/agent/DatasetTreeAllAgent.java
  79. +2
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/AbstractTaskCardService.java
  80. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/dao/TaskDao.java
  81. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/LoadTaskAckVO.java
  82. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/SaveTaskVO.java
  83. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessContext.java
  84. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/IFormDataStore.java
  85. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/AbstractVelocityEngine.java
  86. +1
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/entity/vo/widiget/UiControlPropsVO.java
  87. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/impl/FormDataStoreImpl.java
  88. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonPageDecoder.java
  89. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java
  90. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/AbstractDatasetPlugin.java
  91. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetCardDao.java
  92. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetListDao.java
  93. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetTreeDao.java
  94. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java
  95. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/JavaCodeService.java
  96. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/VueCodeService.java
  97. +2
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/WidgetCodeService.java
  98. +2
    -2
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/DbQueryDatasetService.java
  99. +1
    -1
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/dict/DictTypeListService.java
  100. +16
    -0
      smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java

+ 1
- 1
smtweb-framework/sw-framework-auth/src/main/java/cc/smtweb/framework/auth/web/service/AuthService.java Прегледај датотеку

@@ -3,8 +3,8 @@ package cc.smtweb.framework.auth.web.service;
import cc.smtweb.framework.auth.web.entity.LoginAckVO;
import cc.smtweb.framework.auth.web.entity.LoginVO;
import cc.smtweb.framework.auth.web.entity.UserPO;
import cc.smtweb.framework.core.*;
import cc.smtweb.framework.core.annotation.*;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.session.SessionManager;
import cc.smtweb.framework.core.session.UserSession;
import cc.smtweb.framework.core.db.DbEngine;


smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/R.java → smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/R.java Прегледај датотеку

@@ -1,4 +1,4 @@
package cc.smtweb.framework.core;
package cc.smtweb.framework.core.common;

import cc.smtweb.framework.core.exception.ExceptionMessage;


smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwException.java → smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwException.java Прегледај датотеку

@@ -1,4 +1,4 @@
package cc.smtweb.framework.core;
package cc.smtweb.framework.core.common;

import cc.smtweb.framework.core.exception.ExceptionMessage;


smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwIpAddr.java → smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwIpAddr.java Прегледај датотеку

@@ -1,4 +1,4 @@
package cc.smtweb.framework.core;
package cc.smtweb.framework.core.common;

import lombok.Data;


smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwMap.java → smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwMap.java Прегледај датотеку

@@ -1,7 +1,6 @@
package cc.smtweb.framework.core;
package cc.smtweb.framework.core.common;

import cc.smtweb.framework.core.util.MapUtil;
import com.sun.corba.se.spi.ior.ObjectKey;

import java.util.HashMap;
import java.util.Map;

+ 19
- 5
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.db;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwEnum;
import cc.smtweb.framework.core.db.dao.AbstractEntityDao;
import cc.smtweb.framework.core.db.dao.EntityColumn;
@@ -11,10 +11,7 @@ import cc.smtweb.framework.core.util.CommUtil;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
* 提供数据对象Dao操作
@@ -65,6 +62,23 @@ public class EntityDao<T> extends AbstractEntityDao<T> {
return updateEntity(entity, fields, null);
}

public int updateEntityEx(T entity, String... exfields) {
if (exfields == null || exfields.length == 0) {
return updateEntity(entity, null, null);
}
Set<String> excludeFields = new HashSet<>(exfields.length);
for (String f: exfields) {
excludeFields.add(f.toLowerCase());
}
StringBuilder fields = new StringBuilder(512);
for (ModelField field: modelTable.getFields()) {
if (!excludeFields.contains(field.getName())) {
fields.append(",").append(field.getName());
}
}
return updateEntity(entity, fields.substring(1), null);
}

/**
* 指定自定义条件更新对象
*


+ 1
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java Прегледај датотеку

@@ -1,10 +1,9 @@
package cc.smtweb.framework.core.db;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.db.vo.ModelLinkName;
import cc.smtweb.framework.core.db.vo.ModelTable;
import org.apache.commons.lang3.StringUtils;


+ 1
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/dao/AbstractEntityDao.java Прегледај датотеку

@@ -1,9 +1,8 @@
package cc.smtweb.framework.core.db.dao;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.annotation.SwTable;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.common.AbstractEnum;
import cc.smtweb.framework.core.common.SwEnum;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
import cc.smtweb.framework.core.db.impl.DefaultEntity;


+ 1
- 4
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/BaseBean.java Прегледај датотеку

@@ -1,15 +1,12 @@
package cc.smtweb.framework.core.db.impl;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.util.JsonUtil;
import cc.smtweb.framework.core.util.NumberUtil;
import cc.smtweb.framework.core.util.jackson.BaseBeanSerializer;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

import java.io.Serializable;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;

/**


+ 0
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java Прегледај датотеку

@@ -1,7 +1,5 @@
package cc.smtweb.framework.core.db.jdbc;

import cc.smtweb.framework.core.SwException;

/**
* Created by Akmm at 14-2-3 下午4:52
* 数据库事务操作方法类


+ 2
- 8
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcEngine.java Прегледај датотеку

@@ -1,13 +1,10 @@
package cc.smtweb.framework.core.db.jdbc;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.impl.BaseBean;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.exception.DbException;
import cc.smtweb.framework.core.util.JsonUtil;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -15,9 +12,6 @@ import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.jdbc.core.RowMapper;
import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.DefaultTransactionDefinition;

import javax.sql.DataSource;
import java.sql.Connection;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/SwMapPropertyRowMapper.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.db.jdbc;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import org.springframework.jdbc.core.RowMapper;

import java.sql.ResultSet;


+ 4
- 4
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindBeanException.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.exception;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;

/**
* bean绑定错误
@@ -11,10 +11,10 @@ import cc.smtweb.framework.core.SwException;
public class BindBeanException extends SwException {

/**
*
*
*/
private static final long serialVersionUID = 1L;
private static String msg = "绑定bean异常:Context中已经存在这个bean: ";

public BindBeanException() {
@@ -28,7 +28,7 @@ public class BindBeanException extends SwException {
}

public BindBeanException(String message) {
super(msg+message);
// TODO Auto-generated constructor stub
}


+ 2
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindParamException.java Прегледај датотеку

@@ -1,12 +1,12 @@
package cc.smtweb.framework.core.exception;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;

import java.text.ParseException;

public class BindParamException extends SwException {
/**
*
*
*/
private static final long serialVersionUID = 1L;
private String paramName;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/CacheException.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.exception;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;

public class CacheException extends SwException {
public CacheException(String message) {


+ 0
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/DbException.java Прегледај датотеку

@@ -1,7 +1,5 @@
package cc.smtweb.framework.core.exception;

import cc.smtweb.framework.core.SwException;

/**
* bean绑定错误
* @author kevin


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/JsonParseException.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.exception;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;

public class JsonParseException extends SwException {
public JsonParseException(String s, Exception e) {


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/config/GlobalExceptionHandler.java Прегледај датотеку

@@ -8,7 +8,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;

import java.util.List;
import java.util.stream.Collectors;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/MethodAccessManager.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.cache.ISwCache;
import cc.smtweb.framework.core.mvc.SchedulerManager;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/access/MethodAccess.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller.access;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.exception.BindBeanException;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.mvc.controller.binder.ParamEditor;


+ 2
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/WebDataBinder.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.framework.core.mvc.controller.binder;

import cc.smtweb.framework.core.SwIpAddr;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwIpAddr;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.mvc.controller.IEditor;
import cc.smtweb.framework.core.mvc.controller.binder.attr.BeanAttrEditor;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller.binder.body;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.exception.BindBeanException;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.mvc.controller.IEditor;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanUtil.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller.binder.body;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.FatalBeanException;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller.binder.body;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.exception.BindBeanException;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.mvc.controller.IEditor;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/param/AbstractParameterEditor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller.binder.param;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.mvc.controller.IEditor;
import cc.smtweb.framework.core.mvc.controller.binder.ParamEditor;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ScanContext.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.controller.scan;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.annotation.*;
import cc.smtweb.framework.core.mvc.controller.access.MethodAccess;
import cc.smtweb.framework.core.mvc.controller.access.SchedulerMethodAccess;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/realm/exception/AuthorizationException.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.realm.exception;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;

public class AuthorizationException extends SwException {
public AuthorizationException(String s) {


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/AbstractJobExecutor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.scheduler;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.util.DateUtil;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/SchedulerPoint.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.scheduler;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;

/**
* 定时器断点数据


+ 3
- 3
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractCompService.java Прегледај датотеку

@@ -1,8 +1,8 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.annotation.SwBody;
import cc.smtweb.framework.core.session.UserSession;



+ 1
- 4
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java Прегледај датотеку

@@ -1,11 +1,8 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.jdbc.AbsDbWorker;
import cc.smtweb.framework.core.session.UserSession;
import lombok.extern.slf4j.Slf4j;

/**


+ 1
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractHandler.java Прегледај датотеку

@@ -1,7 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.session.UserSession;

/**


+ 2
- 6
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java Прегледај датотеку

@@ -1,18 +1,14 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.cache.SessionCache;
import cc.smtweb.framework.core.cache.SessionCacheFactory;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.mvc.service.list.FooterField;
import cc.smtweb.framework.core.session.UserSession;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.jdbc.core.ResultSetExtractor;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;


+ 1
- 3
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractLoadHandler.java Прегледај датотеку

@@ -1,8 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.session.UserSession;
import cc.smtweb.framework.core.common.R;

/**
* Created by Akmm at 2022/3/2 19:44


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.jdbc.AbsDbWorker;
import lombok.extern.slf4j.Slf4j;


+ 2
- 11
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractTreeHandler.java Прегледај датотеку

@@ -1,20 +1,11 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.cache.SessionCache;
import cc.smtweb.framework.core.cache.SessionCacheFactory;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
import cc.smtweb.framework.core.mvc.service.list.FooterField;
import cc.smtweb.framework.core.session.UserSession;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* Created by Akmm at 2022/3/2 19:44


+ 3
- 3
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultComboHandler.java Прегледај датотеку

@@ -1,8 +1,8 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.common.SwEnum;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.cache.ModelTableCache;


+ 0
- 4
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultDelHandler.java Прегледај датотеку

@@ -1,16 +1,12 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.db.vo.ModelField;
import cc.smtweb.framework.core.db.vo.ModelIndex;
import cc.smtweb.framework.core.db.vo.ModelTable;
import org.apache.commons.lang3.StringUtils;

/**
* Created by Akmm at 2022/3/2 19:52


+ 1
- 4
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultListHandler.java Прегледај датотеку

@@ -1,8 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.common.SwEnum;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
@@ -10,7 +8,6 @@ import cc.smtweb.framework.core.db.EntityHelper;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.db.vo.ModelField;
import cc.smtweb.framework.core.db.vo.ModelLinkName;
import cc.smtweb.framework.core.db.vo.ModelTable;
import org.apache.commons.lang3.StringUtils;



+ 1
- 10
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultProvider.java Прегледај датотеку

@@ -1,19 +1,10 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.EntityDao;
import cc.smtweb.framework.core.db.EntityHelper;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.db.vo.ModelLinkName;
import cc.smtweb.framework.core.db.vo.ModelTable;
import org.apache.commons.lang3.StringUtils;

import java.util.*;

/**
* Created by Akmm at 2022/3/3 20:04


+ 8
- 3
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.common.SwEnum;
@@ -90,13 +90,18 @@ public class DefaultSaveHandler<T extends DefaultEntity> extends AbstractSaveHan
ModelField field = table.findFieldByType(SwEnum.FieldType.UPDATE_USER.value);
if (field != null) bean.put(field.getName(), us.getUserId());

dao.updateEntity(bean);
updateBean(dao);
if (table.getType() == SwEnum.TableType.TYPE_TREE.value) {
listTreeBean = TreeHelper.getTreeHelper(tableName).resetTreeLevel(bean);
}
}
}

//更新入库
protected void updateBean(EntityDao<T> dao) {
dao.updateEntity(bean);
}


@Override
protected void saveSuccess() {


+ 2
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/IHandler.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.session.UserSession;

/**


+ 1
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java Прегледај датотеку

@@ -1,7 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.SwMap;
import org.apache.commons.lang3.ArrayUtils;
import cc.smtweb.framework.core.common.SwMap;

import java.util.HashMap;
import java.util.Map;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import lombok.Getter;

import java.util.ArrayList;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.mvc.service;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.cache.AbstractCache;
import cc.smtweb.framework.core.cache.CacheManager;
import cc.smtweb.framework.core.common.SwConsts;


+ 18
- 0
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/ICalcVar.java Прегледај датотеку

@@ -0,0 +1,18 @@
package cc.smtweb.framework.core.mvc.variable;

import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.session.UserSession;

/**
* Created by Akmm at 2022/5/12 9:07
* 计算并返回变量值
*/
public interface ICalcVar {
/**
* 计算并返回变量值
* @param params 参数
* @param us 用户会话信息
* @return
*/
Object calcVar(SwMap params, UserSession us);
}

+ 26
- 0
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariable.java Прегледај датотеку

@@ -0,0 +1,26 @@
package cc.smtweb.framework.core.mvc.variable;

import lombok.Data;

/**
* Created by Akmm at 2022/5/12 9:11
* 变量定义信息
*/
@Data
public class SwVariable {
//变量名
private String name;
//中文标题
private String label;
//描述
private String remark;
//计算值的方法
private ICalcVar calcVar;

public SwVariable(String name, String label, String remark, ICalcVar calcVar) {
this.name = name;
this.label = label;
this.remark = remark;
this.calcVar = calcVar;
}
}

+ 44
- 0
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariableFactory.java Прегледај датотеку

@@ -0,0 +1,44 @@
package cc.smtweb.framework.core.mvc.variable;

import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.session.UserSession;
import cc.smtweb.framework.core.util.DateUtil;

import java.util.HashMap;
import java.util.Map;

/**
* Created by Akmm at 2022/5/11 19:07
* 变量工厂,变量的注册及计算
*/
public class SwVariableFactory {
private static SwVariableFactory instance;
static {
instance = new SwVariableFactory();
}

public static SwVariableFactory getInstance() {
return instance;
}

//记录变量信息
private Map<String, SwVariable> map = new HashMap<>();
private SwVariableFactory() {
regVariable("SYS_DATE", "当前日期", "YYYYMMDD格式", (params, us) -> DateUtil.nowDateLong());
regVariable("CUR_USER_ID", "当前操作员id", "当前操作员主键", (params, us) -> us.getUserId());
}

//注册变量
public void regVariable(String name, String label, String remark, ICalcVar calcVar) {
if (map.containsKey(name)) throw new SwException("变量重复定义:name=" + name);
map.put(name, new SwVariable(name, label, remark, calcVar));
}

//计算变量值
public Object calcVar(String name, SwMap params, UserSession us) {
SwVariable var = map.get(name);
if (var == null) throw new SwException("没有定义此变量:" + name);
return var.getCalcVar().calcVar(params, us);
}
}

+ 1
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/redis/RedisManager.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.redis;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;
import cc.smtweb.framework.core.systask.SysTaskManager;
import cc.smtweb.framework.core.util.JsonUtil;
import cc.smtweb.framework.core.util.SpringUtil;
@@ -18,7 +18,6 @@ import org.springframework.context.ApplicationContext;

import javax.annotation.PreDestroy;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;


+ 0
- 2
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/CommUtil.java Прегледај датотеку

@@ -1,6 +1,5 @@
package cc.smtweb.framework.core.util;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.db.impl.BaseBean;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.util.kryo.KryoTool;
@@ -8,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.nio.charset.StandardCharsets;


+ 1
- 4
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java Прегледај датотеку

@@ -1,9 +1,6 @@
package cc.smtweb.framework.core.util;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.db.impl.BaseBean;
import cc.smtweb.framework.core.db.impl.DefaultEntity;
import cc.smtweb.framework.core.db.vo.ModelTable;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.exception.JsonParseException;
import cc.smtweb.framework.core.util.jackson.*;
import com.fasterxml.jackson.annotation.JsonInclude;


+ 1
- 1
smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/MapUtil.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.core.util;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import org.apache.commons.lang3.StringUtils;

import java.util.*;


+ 1
- 2
smtweb-framework/sw-framework-core/src/test/java/cc/smtweb/framework/test/DaoTransTest.java Прегледај датотеку

@@ -1,8 +1,7 @@
package cc.smtweb.framework.test;


import cc.smtweb.framework.core.SwMap;
import org.junit.jupiter.api.Assertions;
import cc.smtweb.framework.core.common.SwMap;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;



+ 1
- 1
smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/controller/FileUploadController.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.file.spring.controller;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.redis.RedisManager;
import cc.smtweb.framework.core.session.SessionUtil;


+ 0
- 1
smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/dao/ImageAttachDao.java Прегледај датотеку

@@ -1,6 +1,5 @@
package cc.smtweb.framework.file.spring.dao;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.file.spring.entity.UploadDataVO;
import cc.smtweb.framework.file.util.ThumbImage;
import org.apache.commons.lang3.StringUtils;


+ 1
- 1
smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoDbService.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.web.web.api;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.annotation.SwPerm;
import cc.smtweb.framework.core.annotation.SwService;


+ 1
- 1
smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoTimerService.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.framework.web.web.api;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.annotation.*;
import cc.smtweb.framework.core.mvc.SchedulerManager;
import cc.smtweb.framework.core.mvc.scheduler.SchedulerPoint;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/exception/BpmException.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.exception;

import cc.smtweb.framework.core.SwException;
import cc.smtweb.framework.core.common.SwException;

import java.io.IOException;



+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmListData.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import lombok.Getter;

import java.util.ArrayList;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmPageContext.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.session.SessionUtil;
import cc.smtweb.framework.core.session.UserSession;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmBeanAttrEditor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.bind;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.exception.BindBeanException;
import cc.smtweb.framework.core.mvc.controller.binder.attr.AbstractAttrEditor;
import cc.smtweb.system.bpm.util.BeanUtil;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmMapAttrEditor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.bind;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.mvc.controller.binder.attr.AbstractAttrEditor;
import cc.smtweb.system.bpm.util.BeanUtil;



+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmPageContextEditor.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.bind;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.mvc.controller.IBeanContext;
import cc.smtweb.framework.core.mvc.controller.IEditor;
import cc.smtweb.system.bpm.core.exception.BpmException;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardDataBuilder.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.builder;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.sqlbuilder.AbstractUpdateSqlBuilder;
import cc.smtweb.framework.core.db.sqlbuilder.DeleteSqlBuilder;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/TreeDataBuilder.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.builder;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder;
import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder;
import cc.smtweb.framework.core.util.JsonUtil;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/entity/form/BpmWidget.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.entity.form;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.engine.ui.entity.vo.widiget.UiControlDataVO;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/AbstractDatasetAgent.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.exception.BpmException;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.bind.IBpmBeanConst;


+ 2
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/AbstractDatasetCardService.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.system.bpm.core.ui.service.card;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmKeyValue;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.IParamConst;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/DatasetCardWorker.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.card;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmKeyValue;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetLoadAgent.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.card.agent;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetAgent;
import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetSaveAgent.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.card.agent;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetAgent;
import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker;


+ 2
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/AbstractDatasetListService.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.system.bpm.core.ui.service.list;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmListData;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.IParamConst;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/DatasetListWorker.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.list;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmMapData;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetCountAgent.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.list.agent;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetAgent;
import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetListAgent.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.list.agent;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetAgent;
import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker;


+ 2
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/AbstractDatasetTreeService.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.system.bpm.core.ui.service.tree;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset;
import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetService;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/DatasetTreeWorker.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.tree;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset;
import cc.smtweb.system.bpm.core.ui.service.DatasetWorker;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/agent/DatasetTreeAllAgent.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.core.ui.service.tree.agent;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetAgent;
import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker;


+ 2
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/AbstractTaskCardService.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.system.bpm.engine.process.impl;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.annotation.SwBody;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.db.DbEngine;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/dao/TaskDao.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.process.impl.dao;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.cache.ModelTableCache;
import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/LoadTaskAckVO.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.process.impl.entity;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import lombok.Getter;

import java.util.ArrayList;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/SaveTaskVO.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.process.impl.entity;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;

public class SaveTaskVO extends SwMap {
public static final String TASK_ID = "bpm_taskId";


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessContext.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.process.runtime;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import lombok.Data;

@Data


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/IFormDataStore.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.ui;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.session.UserSession;

public interface IFormDataStore {


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/AbstractVelocityEngine.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.ui.codegen;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;


+ 1
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/entity/vo/widiget/UiControlPropsVO.java Прегледај датотеку

@@ -1,10 +1,9 @@
package cc.smtweb.system.bpm.engine.ui.entity.vo.widiget;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import org.apache.commons.lang3.StringUtils;

import java.util.List;
import java.util.Map;

public class UiControlPropsVO extends SwMap {
public List readList(String name) {


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/impl/FormDataStoreImpl.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.ui.impl;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder;
import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonPageDecoder.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.engine.ui.loader.json;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.util.JsonUtil;
import cc.smtweb.system.bpm.core.exception.ModelLoaderError;
import cc.smtweb.system.bpm.core.ui.IParamConst;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.spring;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.mvc.config.ControllerConfig;
import cc.smtweb.framework.core.mvc.controller.binder.ParamEditor;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/AbstractDatasetPlugin.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.spring.dao;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.DbEngine;
import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder;
import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetCardDao.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.spring.dao;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder;
import cc.smtweb.system.bpm.core.ui.BpmKeyValue;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetListDao.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.spring.dao;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder;
import cc.smtweb.system.bpm.core.ui.BpmKeyValue;
import cc.smtweb.system.bpm.core.ui.BpmMapData;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetTreeDao.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.spring.dao;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder;
import cc.smtweb.system.bpm.core.ui.BpmPageContext;
import cc.smtweb.system.bpm.core.ui.IParamConst;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.util;

import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.system.bpm.core.exception.BpmException;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/JavaCodeService.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.web.design.codegen;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.annotation.SwService;
import cc.smtweb.framework.core.db.DbEngine;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/VueCodeService.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.web.design.codegen;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.annotation.SwService;
import cc.smtweb.framework.core.session.UserSession;


+ 2
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/WidgetCodeService.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.system.bpm.web.design.codegen;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.annotation.SwBody;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.annotation.SwService;


+ 2
- 2
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/DbQueryDatasetService.java Прегледај датотеку

@@ -1,7 +1,7 @@
package cc.smtweb.system.bpm.web.design.db;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.SwMap;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.common.SwMap;
import cc.smtweb.framework.core.annotation.SwBody;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.annotation.SwService;


+ 1
- 1
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/dict/DictTypeListService.java Прегледај датотеку

@@ -1,6 +1,6 @@
package cc.smtweb.system.bpm.web.design.dict;

import cc.smtweb.framework.core.R;
import cc.smtweb.framework.core.common.R;
import cc.smtweb.framework.core.annotation.SwParam;
import cc.smtweb.framework.core.annotation.SwService;
import cc.smtweb.framework.core.db.DbEngine;


+ 16
- 0
smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java Прегледај датотеку

@@ -78,6 +78,22 @@ public class ModelForm extends DefaultEntity {
put("mf_content", mfContent);
}

public String getOption() {
return getStr("mf_option");
}

public void setOption(String mf_option) {
put("mf_option", mf_option);
}

public String getDataset() {
return getStr("mf_dataset");
}

public void setDataset(String mf_dataset) {
put("mf_dataset", mf_dataset);
}

public long getCreateUid() {
return getLong("mf_create_uid");
}


Неке датотеке нису приказане због велике количине промена

Loading…
Откажи
Сачувај