From 770ca363a41cb65514c0d75f50ad385ad5efd482 Mon Sep 17 00:00:00 2001 From: zhenggm Date: Thu, 12 May 2022 09:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/auth/web/service/AuthService.java | 2 +- .../src/main/java/cc/smtweb/framework/core/R.java | 118 ------------ .../java/cc/smtweb/framework/core/SwException.java | 53 ------ .../java/cc/smtweb/framework/core/SwIpAddr.java | 9 - .../main/java/cc/smtweb/framework/core/SwMap.java | 111 ------------ .../java/cc/smtweb/framework/core/common/R.java | 118 ++++++++++++ .../smtweb/framework/core/common/SwException.java | 53 ++++++ .../cc/smtweb/framework/core/common/SwIpAddr.java | 9 + .../cc/smtweb/framework/core/common/SwMap.java | 110 ++++++++++++ .../cc/smtweb/framework/core/db/EntityDao.java | 24 ++- .../cc/smtweb/framework/core/db/EntityHelper.java | 3 +- .../framework/core/db/dao/AbstractEntityDao.java | 3 +- .../cc/smtweb/framework/core/db/impl/BaseBean.java | 5 +- .../smtweb/framework/core/db/jdbc/IDbWorker.java | 2 - .../smtweb/framework/core/db/jdbc/JdbcEngine.java | 10 +- .../core/db/jdbc/SwMapPropertyRowMapper.java | 2 +- .../core/exception/BindBeanException.java | 8 +- .../core/exception/BindParamException.java | 4 +- .../framework/core/exception/CacheException.java | 2 +- .../framework/core/exception/DbException.java | 2 - .../core/exception/JsonParseException.java | 2 +- .../core/mvc/config/GlobalExceptionHandler.java | 2 +- .../core/mvc/controller/MethodAccessManager.java | 2 +- .../core/mvc/controller/access/MethodAccess.java | 2 +- .../core/mvc/controller/binder/WebDataBinder.java | 4 +- .../mvc/controller/binder/body/BeanBodyEditor.java | 2 +- .../core/mvc/controller/binder/body/BeanUtil.java | 2 +- .../controller/binder/body/SwMapBodyEditor.java | 2 +- .../binder/param/AbstractParameterEditor.java | 2 +- .../core/mvc/controller/scan/ScanContext.java | 2 +- .../realm/exception/AuthorizationException.java | 2 +- .../core/mvc/scheduler/AbstractJobExecutor.java | 2 +- .../core/mvc/scheduler/SchedulerPoint.java | 2 +- .../core/mvc/service/AbstractCompService.java | 6 +- .../core/mvc/service/AbstractDelHandler.java | 5 +- .../core/mvc/service/AbstractHandler.java | 3 +- .../core/mvc/service/AbstractListHandler.java | 8 +- .../core/mvc/service/AbstractLoadHandler.java | 4 +- .../core/mvc/service/AbstractSaveHandler.java | 2 +- .../core/mvc/service/AbstractTreeHandler.java | 13 +- .../core/mvc/service/DefaultComboHandler.java | 6 +- .../core/mvc/service/DefaultDelHandler.java | 4 - .../core/mvc/service/DefaultListHandler.java | 5 +- .../core/mvc/service/DefaultProvider.java | 11 +- .../core/mvc/service/DefaultSaveHandler.java | 11 +- .../framework/core/mvc/service/IHandler.java | 4 +- .../framework/core/mvc/service/SqlNamedPara.java | 3 +- .../framework/core/mvc/service/SwListData.java | 2 +- .../framework/core/mvc/service/TreeHelper.java | 2 +- .../framework/core/mvc/variable/ICalcVar.java | 18 ++ .../framework/core/mvc/variable/SwVariable.java | 26 +++ .../core/mvc/variable/SwVariableFactory.java | 44 +++++ .../smtweb/framework/core/redis/RedisManager.java | 3 +- .../cc/smtweb/framework/core/util/CommUtil.java | 2 - .../cc/smtweb/framework/core/util/JsonUtil.java | 5 +- .../cc/smtweb/framework/core/util/MapUtil.java | 2 +- .../cc/smtweb/framework/test/DaoTransTest.java | 3 +- .../spring/controller/FileUploadController.java | 2 +- .../framework/file/spring/dao/ImageAttachDao.java | 1 - .../framework/web/web/api/DemoDbService.java | 2 +- .../framework/web/web/api/DemoTimerService.java | 2 +- .../system/bpm/core/exception/BpmException.java | 2 +- .../cc/smtweb/system/bpm/core/ui/BpmListData.java | 2 +- .../smtweb/system/bpm/core/ui/BpmPageContext.java | 2 +- .../system/bpm/core/ui/bind/BpmBeanAttrEditor.java | 2 +- .../system/bpm/core/ui/bind/BpmMapAttrEditor.java | 2 +- .../bpm/core/ui/bind/BpmPageContextEditor.java | 2 +- .../bpm/core/ui/builder/CardDataBuilder.java | 2 +- .../bpm/core/ui/builder/TreeDataBuilder.java | 2 +- .../system/bpm/core/ui/entity/form/BpmWidget.java | 2 +- .../bpm/core/ui/service/AbstractDatasetAgent.java | 2 +- .../service/card/AbstractDatasetCardService.java | 4 +- .../core/ui/service/card/DatasetCardWorker.java | 2 +- .../ui/service/card/agent/DatasetLoadAgent.java | 2 +- .../ui/service/card/agent/DatasetSaveAgent.java | 2 +- .../service/list/AbstractDatasetListService.java | 4 +- .../core/ui/service/list/DatasetListWorker.java | 2 +- .../ui/service/list/agent/DatasetCountAgent.java | 2 +- .../ui/service/list/agent/DatasetListAgent.java | 2 +- .../service/tree/AbstractDatasetTreeService.java | 4 +- .../core/ui/service/tree/DatasetTreeWorker.java | 2 +- .../ui/service/tree/agent/DatasetTreeAllAgent.java | 2 +- .../process/impl/AbstractTaskCardService.java | 4 +- .../bpm/engine/process/impl/dao/TaskDao.java | 2 +- .../engine/process/impl/entity/LoadTaskAckVO.java | 2 +- .../bpm/engine/process/impl/entity/SaveTaskVO.java | 2 +- .../bpm/engine/process/runtime/ProcessContext.java | 2 +- .../system/bpm/engine/ui/IFormDataStore.java | 2 +- .../engine/ui/codegen/AbstractVelocityEngine.java | 2 +- .../ui/entity/vo/widiget/UiControlPropsVO.java | 3 +- .../bpm/engine/ui/impl/FormDataStoreImpl.java | 2 +- .../bpm/engine/ui/loader/json/JsonPageDecoder.java | 2 +- .../system/bpm/spring/BpmAutoConfiguration.java | 2 +- .../bpm/spring/dao/AbstractDatasetPlugin.java | 2 +- .../system/bpm/spring/dao/DatasetCardDao.java | 2 +- .../system/bpm/spring/dao/DatasetListDao.java | 2 +- .../system/bpm/spring/dao/DatasetTreeDao.java | 2 +- .../java/cc/smtweb/system/bpm/util/BeanUtil.java | 2 +- .../bpm/web/design/codegen/JavaCodeService.java | 2 +- .../bpm/web/design/codegen/VueCodeService.java | 2 +- .../bpm/web/design/codegen/WidgetCodeService.java | 4 +- .../bpm/web/design/db/DbQueryDatasetService.java | 4 +- .../bpm/web/design/dict/DictTypeListService.java | 2 +- .../system/bpm/web/design/form/ModelForm.java | 16 ++ .../bpm/web/design/form/ModelFormHelper.java | 198 +++++++++++++++++---- .../bpm/web/design/form/ModelFormLoadHandler.java | 53 ++++++ .../bpm/web/design/form/ModelFormSaveHandler.java | 92 ++++++++++ .../bpm/web/design/form/ModelFormService.java | 80 +++++++++ .../bpm/web/design/form/define/PageDataSet.java | 4 +- .../bpm/web/design/form/define/PageInfo.java | 22 --- .../bpm/web/design/form/define/PageModel.java | 15 ++ .../bpm/web/design/model/AspDbCardService.java | 2 +- .../bpm/web/design/model/AspModelCardService.java | 2 +- .../web/design/model/AspModelConfigService.java | 4 +- .../bpm/web/design/model/AspModelListService.java | 2 +- .../bpm/web/design/model/AspModelTreeService.java | 2 +- .../web/design/preview/PreviewAppCardService.java | 2 +- .../web/design/preview/PreviewAppListService.java | 2 +- .../web/design/preview/PreviewMenuTreeService.java | 2 +- .../web/design/table/ModelCatalogTreeHandler.java | 2 +- .../bpm/web/design/table/ModelTableService.java | 8 +- .../bpm/web/design/user/UserGroupListService.java | 2 +- .../bpm/web/engine/AbstractDynPageHandler.java | 27 ++- .../system/bpm/web/engine/DynPageAddHandler.java | 6 +- .../system/bpm/web/engine/DynPageDelHandler.java | 16 +- .../system/bpm/web/engine/DynPageHelper.java | 4 +- .../bpm/web/engine/DynPageLoadOneHandler.java | 11 +- .../system/bpm/web/engine/DynPageSaveHandler.java | 12 +- .../system/bpm/web/engine/DynPageService.java | 6 +- .../smtweb/system/bpm/web/engine/DynRetBean.java | 2 +- .../system/bpm/web/flow/BpmFlowListService.java | 2 +- .../bpm/web/task/service/BpmTaskCardService.java | 2 +- .../bpm/web/task/service/BpmTaskListService.java | 2 +- .../web/task/service/BpmTaskUserListService.java | 2 +- .../smtweb/system/bpm/web/ui/DatasetService.java | 2 +- .../bpm/web/ui/dao/AbstractJsonDatasetPlugin.java | 2 +- .../system/bpm/web/ui/dao/JsonDatasetCardDao.java | 2 +- .../system/bpm/web/ui/dao/JsonDatasetListDao.java | 2 +- .../system/bpm/web/ui/dao/JsonDatasetTreeDao.java | 2 +- .../bpm/web/ui/dynform/DynFormPageService.java | 2 +- .../system/bpm/web/ui/dynform/TaskListService.java | 4 +- .../java/cc/smtweb/system/bpm/test/BpmTest.java | 4 +- .../cc/smtweb/system/bpm/test/ModelFormTest.java | 11 +- .../java/cc/smtweb/system/bpm/test/SpelTest.java | 2 +- 144 files changed, 1006 insertions(+), 601 deletions(-) delete mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/R.java delete mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwException.java delete mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwIpAddr.java delete mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwMap.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/R.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwException.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwIpAddr.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwMap.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/ICalcVar.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariable.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariableFactory.java create mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java create mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java create mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java delete mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageInfo.java create mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java diff --git a/smtweb-framework/sw-framework-auth/src/main/java/cc/smtweb/framework/auth/web/service/AuthService.java b/smtweb-framework/sw-framework-auth/src/main/java/cc/smtweb/framework/auth/web/service/AuthService.java index 4fbb2db..5010856 100644 --- a/smtweb-framework/sw-framework-auth/src/main/java/cc/smtweb/framework/auth/web/service/AuthService.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/R.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/R.java deleted file mode 100644 index c03e217..0000000 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/R.java +++ /dev/null @@ -1,118 +0,0 @@ -package cc.smtweb.framework.core; - -import cc.smtweb.framework.core.exception.ExceptionMessage; - -import java.util.Date; - -/** - * 〈返回结果集〉 - * - * @author kevin - * @since 1.0.0 - */ -public class R extends SwMap { - protected R() { - this(0); - } - - protected R(int code) { - put("now", new Date()); - put("code", code); - } - - public static R success() { - return new R(); - } - - public static R success(Object data) { - return new R().put("data", data); - } - - public static R success(String name, Object data) { - return new R().put(name, data); - } - - public static R error() { - return error(ExceptionMessage.INNER_ERROR.getMsg()); - } - - public static R error(String msg) { - R r = new R(ExceptionMessage.INNER_ERROR.getCode()); - r.put("msg", msg); - return r; - } - - public static R error(int code, String msg) { - R r = new R(code); - r.put("msg", msg); - return r; - } - - public static R errorf(String format, Object...args) { - R r = new R(ExceptionMessage.INNER_ERROR.getCode()); - r.put("msg", String.format(format, args)); - return r; - } - -// public static R error(ExceptionMessage cm) { -// R r = new R(cm.getCode()); -// r.put("msg", cm.getMsg()); -// return r; -// } - -// public static R error(ExceptionMessage cm, Throwable ex) { -// R r = new R(cm.getCode()); -// r.put("msg", cm.getMsg()); -// r.put("exception", ex.getMessage()); -// return r; -// } - - public static R error(String msg, Throwable ex) { - R r = new R(ExceptionMessage.INNER_ERROR.getCode()); - r.put("msg", msg); - r.put("exception", ex.getMessage()); - ex.printStackTrace(); - return r; - } - - public static R error(ExceptionMessage cm, String msg) { - R r = new R(cm.getCode()); - r.put("msg", msg); - return r; - } - - @Override - public R put(String key, Object value) { - super.put(key, value); - return this; - } - - public R putNotNull(String key, Object value) { - if (value != null) { - super.put(key, value); - } - - return this; - } - - public void setMessage(ExceptionMessage cm) { - this.put("code", cm.getCode()); - this.put("msg", cm.getMsg()); - } - - public void setData(Object data) { - this.put("data", data); - } - - public int readCode() { - return this.readInt("code"); - } - - public String readMsg() { - return this.readString("msg"); - } - - public boolean readSuccess() { - return this.readInt("code", -1) == 0; - } -} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwException.java deleted file mode 100644 index 387315c..0000000 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwException.java +++ /dev/null @@ -1,53 +0,0 @@ -package cc.smtweb.framework.core; - -import cc.smtweb.framework.core.exception.ExceptionMessage; - -/** - * 〈全局异常〉 - * - * @author kevin - * @since 1.0.0 - */ -public class SwException extends RuntimeException { - - private static final long serialVersionUID = 8096609992852791423L; - -// private ExceptionMessage cm; - - public SwException() { - } - - public SwException(String msg) { - super(msg); - } - - public SwException(int code, String msg) { - super(msg); - } - - public SwException(String msg, Throwable e) { - super(msg, e); - } - - public SwException(Throwable e) { - super(e.getMessage(), e); - } - - public SwException(ExceptionMessage cm) { - super(cm.getMsg()); - } - - public SwException(ExceptionMessage cm, Throwable e) { - super(cm.getMsg(), e); - } - - public SwException(ExceptionMessage cm, String msg) { - super(msg); - } - - -// public ExceptionMessage getCm() { -// return cm; -// } - -} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwIpAddr.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwIpAddr.java deleted file mode 100644 index 8a55568..0000000 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwIpAddr.java +++ /dev/null @@ -1,9 +0,0 @@ -package cc.smtweb.framework.core; - -import lombok.Data; - -@Data -public class SwIpAddr { - private String ip; - private int port; -} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwMap.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwMap.java deleted file mode 100644 index 21973d4..0000000 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/SwMap.java +++ /dev/null @@ -1,111 +0,0 @@ -package cc.smtweb.framework.core; - -import cc.smtweb.framework.core.util.MapUtil; -import com.sun.corba.se.spi.ior.ObjectKey; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -/** - * 通用map对象，用于无具体类型的传值 - * - * @author kevin - */ -public class SwMap extends HashMap { - public SwMap() { - } - - public SwMap(int initialCapacity) { - super(initialCapacity); - } - - public String readString(String name) { - return MapUtil.readString(this, name); - } - - public SwMap readMap(String name) { - Object v = get(name); - if (v == null) return null; - if (v instanceof SwMap) return (SwMap)v; - if (v instanceof Map) { - Map m = (Map)v; - SwMap map = new SwMap(m.size()); - map.putAll(m); - put(name, map); - return map; - } - throw new SwException("不是合法的Map对象！" + v.getClass().getName()); - } - - public String readString(String name, String defaultValue) { - return MapUtil.readString(this, name, defaultValue); - } - - public long readLong(String name) { - return MapUtil.readLong(this, name); - } - - public Long readLong(String name, Long defaultValue) { - return MapUtil.readLong(this, name, defaultValue); - } - - public Long[] readLongArray(String name) { - return MapUtil.readLongArray(this, name); - } - - public Long[] readLongArray(String name, Long[] defaultValue) { - return MapUtil.readLongArray(this, name, defaultValue); - } - - public Set readLongSet(String name) { - return MapUtil.readLongSet(this, name); - } - - public int readInt(String name) { - return MapUtil.readInt(this, name); - } - - public int readInt(String name, Integer defaultValue) { - return MapUtil.readInt(this, name, defaultValue); - } - - public float readFloat(String name) { - return MapUtil.readFloat(this, name); - } - - public float readFloat(String name, Float defaultValue) { - return MapUtil.readFloat(this, name, defaultValue); - } - - public double readDouble(String name) { - return MapUtil.readDouble(this, name); - } - - public double readDouble(String name, Double defaultValue) { - return MapUtil.readDouble(this, name, defaultValue); - } - - public boolean readBool(String name) { - return MapUtil.readBool(this, name); - } - - public boolean readBool(String name, Boolean defaultValue) { - return MapUtil.readBool(this, name, defaultValue); - } - - @Override - public SwMap put(String name, Object value) { - if (value != null) { - super.put(name, value); - } else { - super.remove(name); - } - - return this; - } - - public static SwMap of(String name, Object value) { - return new SwMap().put(name, value); - } -} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/R.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/R.java new file mode 100644 index 0000000..4a91157 --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/R.java @@ -0,0 +1,118 @@ +package cc.smtweb.framework.core.common; + +import cc.smtweb.framework.core.exception.ExceptionMessage; + +import java.util.Date; + +/** + * 〈返回结果集〉 + * + * @author kevin + * @since 1.0.0 + */ +public class R extends SwMap { + protected R() { + this(0); + } + + protected R(int code) { + put("now", new Date()); + put("code", code); + } + + public static R success() { + return new R(); + } + + public static R success(Object data) { + return new R().put("data", data); + } + + public static R success(String name, Object data) { + return new R().put(name, data); + } + + public static R error() { + return error(ExceptionMessage.INNER_ERROR.getMsg()); + } + + public static R error(String msg) { + R r = new R(ExceptionMessage.INNER_ERROR.getCode()); + r.put("msg", msg); + return r; + } + + public static R error(int code, String msg) { + R r = new R(code); + r.put("msg", msg); + return r; + } + + public static R errorf(String format, Object...args) { + R r = new R(ExceptionMessage.INNER_ERROR.getCode()); + r.put("msg", String.format(format, args)); + return r; + } + +// public static R error(ExceptionMessage cm) { +// R r = new R(cm.getCode()); +// r.put("msg", cm.getMsg()); +// return r; +// } + +// public static R error(ExceptionMessage cm, Throwable ex) { +// R r = new R(cm.getCode()); +// r.put("msg", cm.getMsg()); +// r.put("exception", ex.getMessage()); +// return r; +// } + + public static R error(String msg, Throwable ex) { + R r = new R(ExceptionMessage.INNER_ERROR.getCode()); + r.put("msg", msg); + r.put("exception", ex.getMessage()); + ex.printStackTrace(); + return r; + } + + public static R error(ExceptionMessage cm, String msg) { + R r = new R(cm.getCode()); + r.put("msg", msg); + return r; + } + + @Override + public R put(String key, Object value) { + super.put(key, value); + return this; + } + + public R putNotNull(String key, Object value) { + if (value != null) { + super.put(key, value); + } + + return this; + } + + public void setMessage(ExceptionMessage cm) { + this.put("code", cm.getCode()); + this.put("msg", cm.getMsg()); + } + + public void setData(Object data) { + this.put("data", data); + } + + public int readCode() { + return this.readInt("code"); + } + + public String readMsg() { + return this.readString("msg"); + } + + public boolean readSuccess() { + return this.readInt("code", -1) == 0; + } +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwException.java new file mode 100644 index 0000000..5cd8c51 --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwException.java @@ -0,0 +1,53 @@ +package cc.smtweb.framework.core.common; + +import cc.smtweb.framework.core.exception.ExceptionMessage; + +/** + * 〈全局异常〉 + * + * @author kevin + * @since 1.0.0 + */ +public class SwException extends RuntimeException { + + private static final long serialVersionUID = 8096609992852791423L; + +// private ExceptionMessage cm; + + public SwException() { + } + + public SwException(String msg) { + super(msg); + } + + public SwException(int code, String msg) { + super(msg); + } + + public SwException(String msg, Throwable e) { + super(msg, e); + } + + public SwException(Throwable e) { + super(e.getMessage(), e); + } + + public SwException(ExceptionMessage cm) { + super(cm.getMsg()); + } + + public SwException(ExceptionMessage cm, Throwable e) { + super(cm.getMsg(), e); + } + + public SwException(ExceptionMessage cm, String msg) { + super(msg); + } + + +// public ExceptionMessage getCm() { +// return cm; +// } + +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwIpAddr.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwIpAddr.java new file mode 100644 index 0000000..ab2b357 --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwIpAddr.java @@ -0,0 +1,9 @@ +package cc.smtweb.framework.core.common; + +import lombok.Data; + +@Data +public class SwIpAddr { + private String ip; + private int port; +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwMap.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwMap.java new file mode 100644 index 0000000..d0ab724 --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/common/SwMap.java @@ -0,0 +1,110 @@ +package cc.smtweb.framework.core.common; + +import cc.smtweb.framework.core.util.MapUtil; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +/** + * 通用map对象，用于无具体类型的传值 + * + * @author kevin + */ +public class SwMap extends HashMap { + public SwMap() { + } + + public SwMap(int initialCapacity) { + super(initialCapacity); + } + + public String readString(String name) { + return MapUtil.readString(this, name); + } + + public SwMap readMap(String name) { + Object v = get(name); + if (v == null) return null; + if (v instanceof SwMap) return (SwMap)v; + if (v instanceof Map) { + Map m = (Map)v; + SwMap map = new SwMap(m.size()); + map.putAll(m); + put(name, map); + return map; + } + throw new SwException("不是合法的Map对象！" + v.getClass().getName()); + } + + public String readString(String name, String defaultValue) { + return MapUtil.readString(this, name, defaultValue); + } + + public long readLong(String name) { + return MapUtil.readLong(this, name); + } + + public Long readLong(String name, Long defaultValue) { + return MapUtil.readLong(this, name, defaultValue); + } + + public Long[] readLongArray(String name) { + return MapUtil.readLongArray(this, name); + } + + public Long[] readLongArray(String name, Long[] defaultValue) { + return MapUtil.readLongArray(this, name, defaultValue); + } + + public Set readLongSet(String name) { + return MapUtil.readLongSet(this, name); + } + + public int readInt(String name) { + return MapUtil.readInt(this, name); + } + + public int readInt(String name, Integer defaultValue) { + return MapUtil.readInt(this, name, defaultValue); + } + + public float readFloat(String name) { + return MapUtil.readFloat(this, name); + } + + public float readFloat(String name, Float defaultValue) { + return MapUtil.readFloat(this, name, defaultValue); + } + + public double readDouble(String name) { + return MapUtil.readDouble(this, name); + } + + public double readDouble(String name, Double defaultValue) { + return MapUtil.readDouble(this, name, defaultValue); + } + + public boolean readBool(String name) { + return MapUtil.readBool(this, name); + } + + public boolean readBool(String name, Boolean defaultValue) { + return MapUtil.readBool(this, name, defaultValue); + } + + @Override + public SwMap put(String name, Object value) { + if (value != null) { + super.put(name, value); + } else { + super.remove(name); + } + + return this; + } + + public static SwMap of(String name, Object value) { + return new SwMap().put(name, value); + } +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java index 2a8ece2..796852d 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityDao.java +++ b/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 extends AbstractEntityDao { return updateEntity(entity, fields, null); } + public int updateEntityEx(T entity, String... exfields) { + if (exfields == null || exfields.length == 0) { + return updateEntity(entity, null, null); + } + Set 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); + } + /** * 指定自定义条件更新对象 * diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java index 607f015..fa165a7 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/EntityHelper.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/dao/AbstractEntityDao.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/dao/AbstractEntityDao.java index c3510fe..be49c49 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/dao/AbstractEntityDao.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/BaseBean.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/BaseBean.java index a0408c1..b4de094 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/impl/BaseBean.java +++ b/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; /** diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java index 596cef3..f24c35a 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java +++ b/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 * 数据库事务操作方法类 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcEngine.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcEngine.java index 03c4702..4993eae 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcEngine.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/SwMapPropertyRowMapper.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/SwMapPropertyRowMapper.java index ff2a042..a5aad19 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/SwMapPropertyRowMapper.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindBeanException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindBeanException.java index df2c05c..add31a4 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindBeanException.java +++ b/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 } diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindParamException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindParamException.java index 4eea3c2..195636a 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/BindParamException.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/CacheException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/CacheException.java index 9bc0056..c2eb9b2 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/CacheException.java +++ b/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) { diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/DbException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/DbException.java index 583b001..5ca0635 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/DbException.java +++ b/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 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/JsonParseException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/JsonParseException.java index 4ed1977..e053adb 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/exception/JsonParseException.java +++ b/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) { diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/config/GlobalExceptionHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/config/GlobalExceptionHandler.java index 8f8d360..f0b6bba 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/config/GlobalExceptionHandler.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/MethodAccessManager.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/MethodAccessManager.java index 416dc07..815b67d 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/MethodAccessManager.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/access/MethodAccess.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/access/MethodAccess.java index 962dc7b..456e84f 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/access/MethodAccess.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/WebDataBinder.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/WebDataBinder.java index f46ec50..5d7ab2d 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/WebDataBinder.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java index 968c0cc..e950924 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanUtil.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanUtil.java index 841da79..641492a 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanUtil.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java index cc88a8a..ca550c6 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/param/AbstractParameterEditor.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/param/AbstractParameterEditor.java index 217a502..db51dba 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/param/AbstractParameterEditor.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ScanContext.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ScanContext.java index 6c9d430..f56de44 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/controller/scan/ScanContext.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/realm/exception/AuthorizationException.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/realm/exception/AuthorizationException.java index d3bd6f6..d25f318 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/realm/exception/AuthorizationException.java +++ b/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) { diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/AbstractJobExecutor.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/AbstractJobExecutor.java index 9a0aaa4..57a0fe4 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/AbstractJobExecutor.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/SchedulerPoint.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/SchedulerPoint.java index fda4d9e..b2bf66c 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/scheduler/SchedulerPoint.java +++ b/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; /** * 定时器断点数据 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractCompService.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractCompService.java index 4bfe2fa..3836405 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractCompService.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java index 8c77864..a119a09 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java +++ b/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; /** diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractHandler.java index f923f05..a062905 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractHandler.java +++ b/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; /** diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java index c75c90c..7b5ec53 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractListHandler.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractLoadHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractLoadHandler.java index 4fca79f..3b91574 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractLoadHandler.java +++ b/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 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java index f9019f9..65c2859 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractTreeHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractTreeHandler.java index 74781c7..091a23a 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractTreeHandler.java +++ b/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 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultComboHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultComboHandler.java index c3b9fba..1555d34 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultComboHandler.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultDelHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultDelHandler.java index c6996b4..6c38611 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultDelHandler.java +++ b/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 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultListHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultListHandler.java index 56d3d56..3a03b6c 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultListHandler.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultProvider.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultProvider.java index cc27531..5826a2d 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultProvider.java +++ b/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 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java index fd5f1ba..b3a3a11 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java +++ b/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 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 dao) { + dao.updateEntity(bean); + } + @Override protected void saveSuccess() { diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/IHandler.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/IHandler.java index d374b46..cbfdbb3 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/IHandler.java +++ b/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; /** diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java index 85daa96..97fb6df 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SqlNamedPara.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java index 823b7be..49e0638 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/SwListData.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java index 5af983c..20830d4 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/ICalcVar.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/ICalcVar.java new file mode 100644 index 0000000..4a85ec9 --- /dev/null +++ b/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); +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariable.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariable.java new file mode 100644 index 0000000..a952274 --- /dev/null +++ b/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; + } +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariableFactory.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/variable/SwVariableFactory.java new file mode 100644 index 0000000..a3b7ef6 --- /dev/null +++ b/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 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); + } +} diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/redis/RedisManager.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/redis/RedisManager.java index ece6279..5c5630f 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/redis/RedisManager.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/CommUtil.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/CommUtil.java index 9233a88..d2688b5 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/CommUtil.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java index f752dd9..39cb25f 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java +++ b/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; diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/MapUtil.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/MapUtil.java index c20b6a0..bcaa5f0 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/util/MapUtil.java +++ b/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.*; diff --git a/smtweb-framework/sw-framework-core/src/test/java/cc/smtweb/framework/test/DaoTransTest.java b/smtweb-framework/sw-framework-core/src/test/java/cc/smtweb/framework/test/DaoTransTest.java index 2e17aee..0d227cf 100644 --- a/smtweb-framework/sw-framework-core/src/test/java/cc/smtweb/framework/test/DaoTransTest.java +++ b/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; diff --git a/smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/controller/FileUploadController.java b/smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/controller/FileUploadController.java index 5f25aea..1fdb0a2 100644 --- a/smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/controller/FileUploadController.java +++ b/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; diff --git a/smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/dao/ImageAttachDao.java b/smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/dao/ImageAttachDao.java index abacbb4..694c081 100644 --- a/smtweb-framework/sw-framework-file/src/main/java/cc/smtweb/framework/file/spring/dao/ImageAttachDao.java +++ b/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; diff --git a/smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoDbService.java b/smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoDbService.java index 8de3360..a22e0e0 100644 --- a/smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoDbService.java +++ b/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; diff --git a/smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoTimerService.java b/smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoTimerService.java index 85464df..2fc1859 100644 --- a/smtweb-framework/sw-framework-web/src/main/java/cc/smtweb/framework/web/web/api/DemoTimerService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/exception/BpmException.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/exception/BpmException.java index a7015f2..d82ebbb 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/exception/BpmException.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmListData.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmListData.java index c4974fe..17c5cbc 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmListData.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmPageContext.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmPageContext.java index 8a0b018..350c3d9 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/BpmPageContext.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmBeanAttrEditor.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmBeanAttrEditor.java index 4fa4fd1..4cb129c 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmBeanAttrEditor.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmMapAttrEditor.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmMapAttrEditor.java index 26cd03c..c4fb09d 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmMapAttrEditor.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmPageContextEditor.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmPageContextEditor.java index 0be9f17..192ae78 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/bind/BpmPageContextEditor.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardDataBuilder.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardDataBuilder.java index 203d70f..a91933e 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardDataBuilder.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/TreeDataBuilder.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/TreeDataBuilder.java index 46ca81a..c1a41df 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/TreeDataBuilder.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/entity/form/BpmWidget.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/entity/form/BpmWidget.java index d8c5e8f..dd6c80d 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/entity/form/BpmWidget.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/AbstractDatasetAgent.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/AbstractDatasetAgent.java index 118059e..9cfc2bf 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/AbstractDatasetAgent.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/AbstractDatasetCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/AbstractDatasetCardService.java index 9a89ae7..a42deac 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/AbstractDatasetCardService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/DatasetCardWorker.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/DatasetCardWorker.java index 00d8084..222f1e7 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/DatasetCardWorker.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetLoadAgent.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetLoadAgent.java index 2d20936..233cc16 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetLoadAgent.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetSaveAgent.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetSaveAgent.java index 925cd57..bf322f2 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/agent/DatasetSaveAgent.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/AbstractDatasetListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/AbstractDatasetListService.java index 0a7a864..10a9d38 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/AbstractDatasetListService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/DatasetListWorker.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/DatasetListWorker.java index 77655a1..7ccb420 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/DatasetListWorker.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetCountAgent.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetCountAgent.java index 4004ff0..88d80c0 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetCountAgent.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetListAgent.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetListAgent.java index dfa97f8..25170bd 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/list/agent/DatasetListAgent.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/AbstractDatasetTreeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/AbstractDatasetTreeService.java index bfd472e..b4742c5 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/AbstractDatasetTreeService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/DatasetTreeWorker.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/DatasetTreeWorker.java index f723e94..efe6990 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/DatasetTreeWorker.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/agent/DatasetTreeAllAgent.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/agent/DatasetTreeAllAgent.java index 6c3ee76..2cc495f 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/tree/agent/DatasetTreeAllAgent.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/AbstractTaskCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/AbstractTaskCardService.java index 05198a6..60704bd 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/AbstractTaskCardService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/dao/TaskDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/dao/TaskDao.java index 049677b..a1051b1 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/dao/TaskDao.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/LoadTaskAckVO.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/LoadTaskAckVO.java index 773c806..a68d23e 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/LoadTaskAckVO.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/SaveTaskVO.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/SaveTaskVO.java index 450726a..077686b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/SaveTaskVO.java +++ b/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"; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessContext.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessContext.java index 4ab8b9e..c95b3ac 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessContext.java +++ b/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 diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/IFormDataStore.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/IFormDataStore.java index 13be368..fafff9e 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/IFormDataStore.java +++ b/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 { diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/AbstractVelocityEngine.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/AbstractVelocityEngine.java index d277d4b..69cce87 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/AbstractVelocityEngine.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/entity/vo/widiget/UiControlPropsVO.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/entity/vo/widiget/UiControlPropsVO.java index b950c0c..5c8eae8 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/entity/vo/widiget/UiControlPropsVO.java +++ b/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) { diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/impl/FormDataStoreImpl.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/impl/FormDataStoreImpl.java index 95534fe..1524fb0 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/impl/FormDataStoreImpl.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonPageDecoder.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonPageDecoder.java index a6c47ce..920f586 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonPageDecoder.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java index b643c3d..5307647 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/BpmAutoConfiguration.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/AbstractDatasetPlugin.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/AbstractDatasetPlugin.java index e1050ed..ca250c4 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/AbstractDatasetPlugin.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetCardDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetCardDao.java index 2d69dce..b0d85dc 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetCardDao.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetListDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetListDao.java index 46172b2..e8da7be 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetListDao.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetTreeDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetTreeDao.java index acf4d3e..e2a6b07 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetTreeDao.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java index b8e62c1..c2f1c13 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/util/BeanUtil.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/JavaCodeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/JavaCodeService.java index a6b27c9..d9c67e3 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/JavaCodeService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/VueCodeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/VueCodeService.java index 4edfac5..072ca7b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/VueCodeService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/WidgetCodeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/WidgetCodeService.java index d9a0b88..8087ec7 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/WidgetCodeService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/DbQueryDatasetService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/DbQueryDatasetService.java index 8cb9a58..829987c 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/db/DbQueryDatasetService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/dict/DictTypeListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/dict/DictTypeListService.java index 9341edc..038516a 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/dict/DictTypeListService.java +++ b/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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java index 0aa8d5a..1dccd2d 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelForm.java +++ b/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"); } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java index e2dd9b1..7a87228 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java @@ -1,14 +1,17 @@ package cc.smtweb.system.bpm.web.design.form; -import cc.smtweb.framework.core.SwException; +import cc.smtweb.framework.core.common.SwException; +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.common.SwEnum; +import cc.smtweb.framework.core.mvc.variable.SwVariableFactory; +import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.framework.core.util.JsonUtil; import cc.smtweb.framework.core.util.MapUtil; import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; import cc.smtweb.system.bpm.web.design.form.define.PageDatasetField; -import cc.smtweb.system.bpm.web.design.form.define.PageInfo; +import cc.smtweb.system.bpm.web.design.form.define.PageModel; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ser.FilterProvider; @@ -17,8 +20,7 @@ import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; import org.apache.commons.lang3.StringUtils; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by Akmm at 2022/4/20 18:45 @@ -36,20 +38,36 @@ public class ModelFormHelper { return cache.get(formId); } + public static Map parsePageDataset(long formId) { + ModelForm form = getFromCache(formId); + if (form == null) return null; + return parsePageDataset(form.getDataset()); + } + + public static Map parsePageDataset(String jsonStr) { + if (StringUtils.isEmpty(jsonStr)) return null; + PageDataSet[] list = JsonUtil.parse(jsonStr, PageDataSet[].class); + Map map = new LinkedHashMap<>(list.length); + for (PageDataSet ds: list) { + map.put(ds.name, ds); + ds.resetFields(); + } + return map; + } + /** * 根据json字符串解析对象 * @param jsonStr * @return */ - public static PageInfo parsePageInfo(String jsonStr) { + public static PageModel parsePageInfo(String jsonStr) { if (StringUtils.isEmpty(jsonStr)) return null; - return JsonUtil.parse(jsonStr, PageInfo.class); + return JsonUtil.parse(jsonStr, PageModel.class); } - public static PageInfo parsePageInfo(long formId) { - ModelForm form = getFromCache(formId); - if (form == null) return null; - return parsePageInfo(form.getContent()); + public static SwMap parseFormOption(String jsonStr) { + if (StringUtils.isEmpty(jsonStr)) return null; + return JsonUtil.parse(jsonStr, SwMap.class); } /** @@ -57,26 +75,26 @@ public class ModelFormHelper { * 主要处理内容： * 1、model的一些maxlen、默认值等信息，如果和数据库一致，则去掉 * 2、db中的只保留表、字段和别名 - * @param jsonStr + * @param form * @return */ - public static String buildSaveJson(String jsonStr) throws Exception { - PageInfo pageInfo = parsePageInfo(jsonStr); - resetDataset(pageInfo); + public static String buildSaveModel(ModelForm form) { + Map mapDataset = parsePageDataset(form.getDataset()); + PageModel pageInfo = parsePageInfo(form.getContent()); for (Map model: pageInfo.model) { Map props = (Map)model.get("props"); - buildSaveModelFields(pageInfo, props, true); - buildSaveModelFields(pageInfo, props, false); + buildSaveModelFields(mapDataset, pageInfo, props, true); + buildSaveModelFields(mapDataset, pageInfo, props, false); } - return encodeSaveJson(pageInfo); + return JsonUtil.encodeString(pageInfo); } //处理model的fields和filters - private static void buildSaveModelFields(PageInfo pageInfo, Map props, boolean isField) { + private static void buildSaveModelFields(Map mapDataset, PageModel pageInfo, Map props, boolean isField) { String db = (String)props.get("db"); //没有配置db，配置有误，不处理 if (StringUtils.isEmpty(db)) throw new SwException("model未配置数据集db，无法解析！"); - PageDataSet pds = pageInfo.findDataSet(db); + PageDataSet pds = mapDataset.get(db); String key = isField ? "fields":"filters"; List> fields = (List>)props.get(key); if (fields == null || fields.isEmpty()) return; @@ -100,16 +118,24 @@ public class ModelFormHelper { } } - //将db中field按表定义重置一下 - public static void resetDataset(PageInfo pageInfo) { - for (PageDataSet ds: pageInfo.db) { - ds.resetFields(); + + public static String buildSaveDataset(String jsonStr) { + Map map = parsePageDataset(jsonStr); + if (map == null) return null; + try { + return buildSaveDataset(map.values()); + } catch (JsonProcessingException e) { + throw new SwException(e); } } + /** + * 构建待保存的数据集 + * @param datasets + * @return + * @throws JsonProcessingException + */ + public static String buildSaveDataset(Collection datasets) throws JsonProcessingException { - //构建成需要保存的字符串 - private static String encodeSaveJson(PageInfo pageInfo) throws JsonProcessingException { - //todo ObjectMapper mapper = new ObjectMapper(); FilterProvider filters = new SimpleFilterProvider().addFilter("datasetField", new SimpleBeanPropertyFilter(){ private final String includes = "name,label,field,table"; @@ -124,31 +150,33 @@ public class ModelFormHelper { return includes.contains(","+ writer.getName()); } }); - return mapper.writer(filters).writeValueAsString(pageInfo); + return mapper.writer(filters).writeValueAsString(datasets); } /** * 根据数据库存储的信息，加工处理成页面要的，与buildsave逆向 - * @param jsonStr + * @param form * @return */ - public static String buildReqJson(String jsonStr) { - PageInfo pageInfo = parsePageInfo(jsonStr); - resetDataset(pageInfo); + public static String buildReqModel(ModelForm form) { + Map mapDataset = parsePageDataset(form.getDataset()); + PageModel pageInfo = parsePageInfo(form.getContent()); for (Map model: pageInfo.model) { Map props = (Map)model.get("props"); - buildReqModelFields(pageInfo, props, true); - buildReqModelFields(pageInfo, props, false); + buildReqModelFields(mapDataset, pageInfo, props, true); + buildReqModelFields(mapDataset, pageInfo, props, false); } return JsonUtil.encodeString(pageInfo); } //处理model的fields和filters - private static void buildReqModelFields(PageInfo pageInfo, Map props, boolean isField) { + private static void buildReqModelFields(Map mapDataset, PageModel pageInfo, Map props, boolean isField) { String db = (String)props.get("db"); //没有配置db，配置有误，不处理 if (StringUtils.isEmpty(db)) return; - PageDataSet pds = pageInfo.findDataSet(db); + PageDataSet pds = mapDataset.get(db); + if (pds == null) return; + String key = isField ? "fields":"filters"; List> fields = (List>)props.get(key); if (fields == null || fields.isEmpty()) return; @@ -171,4 +199,104 @@ public class ModelFormHelper { } } } + + /** + * 根据数据库存储的信息，加工处理成页面要的，与buildsave逆向 + * @param form + * @return + */ + public static String buildEngineModel(ModelForm form, SwMap params, UserSession us) { + Map mapDataset = parsePageDataset(form.getDataset()); + if (mapDataset == null) return ""; + + SwMap ret = new SwMap(); + PageModel pageInfo = parsePageInfo(form.getContent()); + if (pageInfo == null) return ""; + //form不用管 + if (pageInfo.form != null) ret.put("form", pageInfo); + List listModel = new ArrayList<>(); + ret.put("model", listModel); + //构建Model + for (Map model: pageInfo.model) { + Map props = (Map)model.get("props"); + String db = (String)props.get("db"); + PageDataSet dataSet = mapDataset.get(db); + if (dataSet == null) throw new SwException("未找到指定的数据集定义！" + db); + + listModel.add(buildEngineModelMap(dataSet, model)); + } + ret.put("extra", buildEngineExtra(pageInfo.option, params, us)); + return JsonUtil.encodeString(ret); + } + + //构建model部分 + private static SwMap buildEngineModelMap(PageDataSet dataSet, Map model) { + SwMap ret = new SwMap(); + + ret.put("name", dataSet.name); + ret.put("label", dataSet.label); + ret.put("type", dataSet.type); + ret.put("idField", dataSet.idField); + ret.put("lazy", dataSet.lazy); + ret.put("canEdit", dataSet.canEdit); + + ret.put("fields", buildEngineFields(dataSet, (List>)model.get("fields"), true)); + ret.put("filters", buildEngineFields(dataSet, (List>)model.get("filters"), false)); + + return ret; + } + + //构建fields和filters数组 + private static List buildEngineFields(PageDataSet dataSet, List> fields, boolean isField) { + List listRet = new ArrayList<>(); + for (Map field: fields) { + SwMap fr = new SwMap(); + fr.put("id", field.get("id")); + Map props = (Map)field.get("props"); + if (props == null) continue; + fr.putAll(props); + + String fn = (String)fr.get("field"); + if (StringUtils.isEmpty(fn)) continue; + PageDatasetField pdf = isField ? dataSet.getField(fn) : dataSet.getFilter(fn); + if (pdf == null) continue; + + //必填字段 + if (!fr.containsKey("required")) { + fr.put("required", pdf.isNotNull()); + } + + if (!fr.containsKey("maxlength")) { + fr.put("maxlength", SwEnum.DataType.instance.getByValue(pdf.dataType).dataLength); + } + } + return listRet; + } + + //根据option构建Extra部分 + private static SwMap buildEngineExtra(Map option, SwMap params, UserSession us) { + SwMap map = new SwMap(); + if (option == null) return map; + //控件信息 + SwMap widget = new SwMap(); + map.put("widget", widget); + + long[] widgetIds = (long[])option.get("widgetRef"); + for (long id: widgetIds) { + ModelForm widgetForm = getFromCache(id); + if (widgetForm == null) throw new SwException("没有找到指定的控件定义！id=" + id); + SwMap widgetOpts = parseFormOption(widgetForm.getOption()); + widget.put("service", widgetForm.getService()); + if (widgetOpts != null) widget.putAll(widgetOpts); + widget.put("define", widgetForm.getContent()); + } + //构建变量 + SwMap mapVar = new SwMap(); + map.put("var", mapVar); + String[] vars = (String[])option.get("vars"); + for (String var: vars) { + mapVar.put(var, SwVariableFactory.getInstance().calcVar(var, params, us)); + } + return map; + } } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java new file mode 100644 index 0000000..772fc1a --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormLoadHandler.java @@ -0,0 +1,53 @@ +package cc.smtweb.system.bpm.web.design.form; + +import cc.smtweb.framework.core.common.R; +import cc.smtweb.framework.core.common.SwException; +import cc.smtweb.framework.core.mvc.service.DefaultLoadHandler; +import cc.smtweb.framework.core.util.JsonUtil; +import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; + +import java.util.Map; + +/** + * Created by Akmm at 2022/5/9 16:17 + */ +public class ModelFormLoadHandler extends DefaultLoadHandler { + public ModelFormLoadHandler() { + super(ModelForm.ENTITY_NAME); + } + + @Override + protected ModelForm loadComp(long id) { + ModelForm bean = super.loadComp(id); + //去掉content和dataset + bean.getData().remove("mf_content"); + bean.getData().remove("mf_dataset"); + return bean; + } + + //页面设计-加载数据集定义 + public R loadDataset() { + long id = params.readLong("id"); + ModelForm bean = super.loadComp(id); + if (bean == null) throw new SwException("没有找到指定数据集定义！id=" + id); + Map map = ModelFormHelper.parsePageDataset(bean.getDataset()); + if (map == null) return R.success(""); + return R.success(JsonUtil.encodeString(map.values())); + } + + //页面设计 - 加载页面model定义 + public R loadModel() { + long id = params.readLong("id"); + ModelForm bean = super.loadComp(id); + if (bean == null) throw new SwException("没有找到指定数据集定义！id=" + id); + return R.success(ModelFormHelper.buildReqModel(bean)); + } + + //页面引擎-获取页面模型 + public R loadForm() { + long id = params.readLong("id"); + ModelForm bean = super.loadComp(id); + if (bean == null) throw new SwException("没有找到指定数据集定义！id=" + id); + return R.success(ModelFormHelper.buildEngineModel(bean, params, us)); + } +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java new file mode 100644 index 0000000..c13b9fa --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java @@ -0,0 +1,92 @@ +package cc.smtweb.system.bpm.web.design.form; + +import cc.smtweb.framework.core.common.R; +import cc.smtweb.framework.core.common.SwException; +import cc.smtweb.framework.core.common.SwEnum; +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.jdbc.AbsDbWorker; +import cc.smtweb.framework.core.db.vo.ModelField; +import cc.smtweb.framework.core.db.vo.ModelTable; +import cc.smtweb.framework.core.mvc.service.DefaultSaveHandler; +import org.apache.commons.lang3.StringUtils; + +/** + * Created by Akmm at 2022/5/9 17:05 + * 页面定义保存，注意不要覆盖content和dataset + */ +public class ModelFormSaveHandler extends DefaultSaveHandler { + public ModelFormSaveHandler() { + super(ModelForm.ENTITY_NAME); + } + + @Override + protected void updateBean(EntityDao dao) { + dao.updateEntityEx(bean, "mf_content", "mf_dataset"); + } + + public R saveDataset() { + long id = params.readLong("id"); + String data = params.readString("data"); + ModelForm form = loadComp(id); + if (StringUtils.isEmpty(data)) { + throw new SwException("没有待保存的数据！"); + } + form.setDataset(ModelFormHelper.buildSaveDataset(data)); + DbEngine.getInstance().doTrans(new AbsDbWorker() { + @Override + public void work() { + EntityDao dao = DbEngine.getInstance().findDao(tableName); + + ModelTable table = ModelTableCache.getInstance().getByName(tableName); + ModelField field = table.findFieldByType(SwEnum.FieldType.UPDATE_USER.value); + if (field != null) bean.put(field.getName(), us.getUserId()); + dao.updateEntity(form, "mf_dataset"); + } + + @Override + public void doAfterDbCommit() { + saveSuccess(); + } + + @Override + public void doAfterDbRollback() { + saveFailed(); + } + }); + return R.success(); + } + + public R saveModel() { + long id = params.readLong("id"); + String data = params.readString("data"); + ModelForm form = loadComp(id); + if (StringUtils.isEmpty(data)) { + throw new SwException("没有待保存的数据！"); + } + form.setContent(ModelFormHelper.buildSaveModel(form)); + DbEngine.getInstance().doTrans(new AbsDbWorker() { + @Override + public void work() { + EntityDao dao = DbEngine.getInstance().findDao(tableName); + + ModelTable table = ModelTableCache.getInstance().getByName(tableName); + ModelField field = table.findFieldByType(SwEnum.FieldType.UPDATE_USER.value); + if (field != null) bean.put(field.getName(), us.getUserId()); + dao.updateEntity(form, "mf_content"); + } + + @Override + public void doAfterDbCommit() { + saveSuccess(); + } + + @Override + public void doAfterDbRollback() { + saveFailed(); + } + }); + return R.success(); + } +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java new file mode 100644 index 0000000..6c36126 --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormService.java @@ -0,0 +1,80 @@ +package cc.smtweb.system.bpm.web.design.form; + +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.SwService; +import cc.smtweb.framework.core.mvc.service.*; +import cc.smtweb.framework.core.session.UserSession; + +/** + * Created by Akmm at 2022/3/22 9:12 + */ +@SwService +public class ModelFormService extends AbstractCompService { + @Override + protected IHandler createHandler(String type) { + switch (type) { + case TYPE_LOAD: + return new ModelFormLoadHandler(); + case TYPE_SAVE: + return new ModelFormSaveHandler(); + case TYPE_DEL: + return new DefaultDelHandler(ModelForm.ENTITY_NAME); + case TYPE_LIST: + return new DefaultListHandler(ModelForm.ENTITY_NAME); + + } + return null; + } + + //保存数据集 + public R saveDataset(@SwBody SwMap params, UserSession us) { + try { + ModelFormSaveHandler handler = (ModelFormSaveHandler) getHandler(params, us, TYPE_SAVE); + return handler.saveDataset(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } + + //加载数据集 + public R loadDataset(@SwBody SwMap params, UserSession us) { + try { + ModelFormLoadHandler handler = (ModelFormLoadHandler) getHandler(params, us, TYPE_LOAD); + return handler.loadDataset(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } + + //保存页面模型 + public R saveModel(@SwBody SwMap params, UserSession us) { + try { + ModelFormSaveHandler handler = (ModelFormSaveHandler) getHandler(params, us, TYPE_SAVE); + return handler.saveModel(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } + + //加载页面模型 + public R loadModel(@SwBody SwMap params, UserSession us) { + try { + ModelFormLoadHandler handler = (ModelFormLoadHandler) getHandler(params, us, TYPE_LOAD); + return handler.loadModel(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } + + //加载引擎用页面模型 + public R model(@SwBody SwMap params, UserSession us) { + try { + ModelFormLoadHandler handler = (ModelFormLoadHandler) getHandler(params, us, TYPE_LOAD); + return handler.loadForm(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataSet.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataSet.java index 77fd5c1..687d7fe 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataSet.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageDataSet.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.form.define; -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.cache.ModelTableCache; import cc.smtweb.framework.core.db.vo.ModelField; @@ -24,6 +24,8 @@ public class PageDataSet { public String type; //主表 public long masterTable; + //id字段 对应field的name + public String idField; //list的自定义sql，仅列表支持，select fields from tables [condition] group by xxx order by xxx public String sql; //固定条件，如f1='a' and f2=:p1 diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageInfo.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageInfo.java deleted file mode 100644 index bc48760..0000000 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageInfo.java +++ /dev/null @@ -1,22 +0,0 @@ -package cc.smtweb.system.bpm.web.design.form.define; - -import java.util.List; -import java.util.Map; - -/** - * Created by Akmm at 2022/4/20 15:39 - */ -public class PageInfo { - public List> form; - public List> model; - public Map option; - public Map extra; - public List db; - - public PageDataSet findDataSet(String name) { - for (PageDataSet pds: db) { - if (name.equalsIgnoreCase(pds.name)) return pds; - } - return null; - } -} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java new file mode 100644 index 0000000..15dcf8f --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/define/PageModel.java @@ -0,0 +1,15 @@ +package cc.smtweb.system.bpm.web.design.form.define; + +import java.util.List; +import java.util.Map; + +/** + * Created by Akmm at 2022/4/20 15:39 + * 页面模型 + */ +public class PageModel { + public List> form; + public List> model; + public Map option; + public Map extra; +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspDbCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspDbCardService.java index 11340a3..8cc92bc 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspDbCardService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspDbCardService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.model; -import cc.smtweb.framework.core.R; +import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelCardService.java index ae5994f..1c02087 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelCardService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelCardService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.model; -import cc.smtweb.framework.core.R; +import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelConfigService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelConfigService.java index 1141233..52aaea8 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelConfigService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelConfigService.java @@ -1,7 +1,7 @@ package cc.smtweb.system.bpm.web.design.model; -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.SwParam; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.common.SwEnum; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelListService.java index 1a7dfee..a23d97c 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelListService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.model; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelTreeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelTreeService.java index 5e0d836..364ad6d 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelTreeService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelTreeService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.model; -import cc.smtweb.framework.core.R; +import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppCardService.java index ea3cf01..7a32502 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppCardService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppCardService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.preview; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppListService.java index 308da55..8f7a175 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewAppListService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.preview; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java index 50f00f0..323c1ee 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/preview/PreviewMenuTreeService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.preview; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java index 9e38c5f..5846440 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelCatalogTreeHandler.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.table; -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.EntityDao; import cc.smtweb.framework.core.db.cache.ModelTableCache; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelTableService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelTableService.java index e3a56bc..82370d9 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelTableService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/table/ModelTableService.java @@ -14,13 +14,13 @@ public class ModelTableService extends AbstractCompService { protected IHandler createHandler(String type) { switch (type) { case TYPE_LOAD: - return new DefaultLoadHandler(ModelTable.ENTITY_NAME); + return new DefaultLoadHandler(ModelTable.ENTITY_NAME); case TYPE_SAVE: - return new DefaultSaveHandler<>(ModelTable.ENTITY_NAME); + return new ModelTableSaveHanlder(); case TYPE_DEL: - return new DefaultDelHandler<>(ModelTable.ENTITY_NAME); + return new DefaultDelHandler(ModelTable.ENTITY_NAME); case TYPE_LIST: - return new DefaultListHandler<>(ModelTable.ENTITY_NAME); + return new DefaultListHandler(ModelTable.ENTITY_NAME); case TYPE_COMBO: return new ModelTableComboHandler(); diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/user/UserGroupListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/user/UserGroupListService.java index 39a77f9..80e8f9c 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/user/UserGroupListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/user/UserGroupListService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.design.user; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/AbstractDynPageHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/AbstractDynPageHandler.java index f28d88b..f8b61e2 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/AbstractDynPageHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/AbstractDynPageHandler.java @@ -1,11 +1,13 @@ package cc.smtweb.system.bpm.web.engine; -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.mvc.service.AbstractHandler; import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.system.bpm.web.design.form.ModelFormHelper; -import cc.smtweb.system.bpm.web.design.form.define.PageInfo; +import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; + +import java.util.Map; /** * Created by Akmm at 2022/4/21 17:53 @@ -13,15 +15,26 @@ import cc.smtweb.system.bpm.web.design.form.define.PageInfo; public abstract class AbstractDynPageHandler extends AbstractHandler { //页面定义id protected long pageId; - protected PageInfo pageInfo; + protected Map mapDataset; @Override public void init(SwMap params, UserSession us) { super.init(params, us); pageId = params.readLong("pageId"); - pageInfo = ModelFormHelper.parsePageInfo(pageId); - if (pageInfo == null) throw new SwException("没有找到页面定义数据！"); - ModelFormHelper.resetDataset(pageInfo); + mapDataset = ModelFormHelper.parsePageDataset(pageId); + if (mapDataset == null) throw new SwException("没有找到页面定义数据！"); + } + + protected PageDataSet findDataset(String name) { + return mapDataset.get(name); + } + + //获取第一个，主数据集 + protected PageDataSet findMasterDataset() { + for (PageDataSet dataSet: mapDataset.values()) { + return dataSet; + } + return null; } } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageAddHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageAddHandler.java index 8085623..574acc6 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageAddHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageAddHandler.java @@ -1,7 +1,7 @@ package cc.smtweb.system.bpm.web.engine; -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.common.SwEnum; import cc.smtweb.framework.core.mvc.service.SwListData; import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; @@ -19,7 +19,7 @@ public class DynPageAddHandler extends AbstractDynPageHandler { public R doWork() throws Exception { //返回的数据，以dataset.name为key，查出的结果（bean或list）为value Map mapRet = new HashMap<>(); - for (PageDataSet dataSet : pageInfo.db) { + for (PageDataSet dataSet : mapDataset.values()) { if (!dataSet.canEdit) { continue; } diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageDelHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageDelHandler.java index d825e2f..01ac235 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageDelHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageDelHandler.java @@ -1,8 +1,7 @@ package cc.smtweb.system.bpm.web.engine; -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.cache.AbstractCache; import cc.smtweb.framework.core.cache.CacheManager; import cc.smtweb.framework.core.common.SwEnum; @@ -11,9 +10,7 @@ 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.jdbc.AbsDbWorker; -import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.db.vo.ModelTable; -import cc.smtweb.framework.core.mvc.service.SwListData; import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; import cc.smtweb.system.bpm.web.design.form.define.PageDatasetFilter; import org.apache.commons.lang3.StringUtils; @@ -22,7 +19,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.function.Function; /** * Created by Akmm at 2022/4/21 17:53 @@ -44,7 +40,7 @@ public class DynPageDelHandler extends AbstractDynPageHandler { //数据集 String dbName = params.readString("dataset"); //对应的数据集定义 - PageDataSet pageDataSet = pageInfo.findDataSet(dbName); + PageDataSet pageDataSet = findDataset(dbName); if (pageDataSet == null) throw new SwException("没有找到指定的的数据集定义：" + dbName + "！"); long id = params.readLong("id"); @@ -77,13 +73,13 @@ public class DynPageDelHandler extends AbstractDynPageHandler { long id = params.readLong("id"); if (id == 0) throw new SwException("没有收到待删除记录Id！"); //校验主表即可 - PageDataSet masterDs = pageInfo.db.get(0); - if (!masterDs.canEdit || !SwEnum.DatasetType.FORM.value.equals(masterDs.type)) + PageDataSet masterDs = findMasterDataset(); + if (masterDs == null || !masterDs.canEdit || !SwEnum.DatasetType.FORM.value.equals(masterDs.type)) throw new SwException("主表不允许删除！"); checkBean(masterDs, id); Map mapRemovableInfo = new HashMap<>(); - for (PageDataSet pageDataSet : pageInfo.db) { + for (PageDataSet pageDataSet : mapDataset.values()) { //非表单编辑，不管 if (!pageDataSet.canEdit || !SwEnum.DatasetType.FORM.value.equals(pageDataSet.type)) continue; ModelTable table = ModelTableCache.getInstance().get(pageDataSet.masterTable); diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageHelper.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageHelper.java index 701a2d2..3b7b8ed 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageHelper.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageHelper.java @@ -1,7 +1,7 @@ package cc.smtweb.system.bpm.web.engine; -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.common.SwConsts; import cc.smtweb.framework.core.common.SwEnum; import cc.smtweb.framework.core.db.DbEngine; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageLoadOneHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageLoadOneHandler.java index fba22db..c892d02 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageLoadOneHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageLoadOneHandler.java @@ -1,21 +1,18 @@ package cc.smtweb.system.bpm.web.engine; -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.EntityHelper; import cc.smtweb.framework.core.db.cache.ModelTableCache; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.mvc.service.SqlNamedPara; -import cc.smtweb.framework.core.mvc.service.SqlPara; import cc.smtweb.framework.core.mvc.service.SwListData; import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; -import java.util.HashMap; import java.util.List; -import java.util.Map; import static cc.smtweb.framework.core.common.SwConsts.TOTAL_KEY; @@ -36,7 +33,7 @@ public class DynPageLoadOneHandler extends AbstractDynPageHandler { dbName = params.readString("dataset"); filter = (SwMap)params.get("filter"); - pageDataSet = pageInfo.findDataSet(dbName); + pageDataSet = findDataset(dbName); if (pageDataSet == null) throw new SwException("没有找到指定的的数据集定义：" + dbName + "！"); DynRetBean bean = null; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageSaveHandler.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageSaveHandler.java index 97f3ef1..c41186f 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageSaveHandler.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageSaveHandler.java @@ -1,8 +1,8 @@ package cc.smtweb.system.bpm.web.engine; -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.cache.AbstractCache; import cc.smtweb.framework.core.cache.CacheManager; import cc.smtweb.framework.core.common.SwEnum; @@ -11,11 +11,9 @@ 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.jdbc.AbsDbWorker; -import cc.smtweb.framework.core.db.jdbc.IDbWorker; 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 cc.smtweb.framework.core.mvc.service.SwListData; import cc.smtweb.framework.core.mvc.service.TreeHelper; import cc.smtweb.framework.core.util.CommUtil; import cc.smtweb.system.bpm.web.design.form.define.PageDataSet; @@ -48,7 +46,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler { SwMap data = params.readMap("data"); if (data == null) throw new SwException("没有收到待保存的的数据：" + dbName + "！"); //对应的数据集定义 - PageDataSet pageDataSet = pageInfo.findDataSet(dbName); + PageDataSet pageDataSet = findDataset(dbName); if (pageDataSet == null) throw new SwException("没有找到指定的的数据集定义：" + dbName + "！"); //读取待保存的bean DefaultEntity bean = readBeanFromPage(pageDataSet, data); @@ -87,7 +85,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler { SwMap filter = (SwMap) params.get("filter"); Map map = new LinkedHashMap<>(); - for (PageDataSet pageDataSet : pageInfo.db) { + for (PageDataSet pageDataSet : mapDataset.values()) { //非表单编辑，不管 if (!pageDataSet.canEdit || !SwEnum.DatasetType.FORM.value.equals(pageDataSet.type)) continue; SwMap dsData = (SwMap) data.get(pageDataSet.name); diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageService.java index 50875de..f062cbb 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynPageService.java @@ -1,13 +1,11 @@ package cc.smtweb.system.bpm.web.engine; -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.SwService; -import cc.smtweb.framework.core.db.vo.ModelCatalog; import cc.smtweb.framework.core.mvc.service.*; import cc.smtweb.framework.core.session.UserSession; -import cc.smtweb.system.bpm.web.design.table.ModelCatalogTreeHandler; /** * Created by Akmm at 2022/4/21 17:43 diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynRetBean.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynRetBean.java index da19c9f..ce1c89d 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynRetBean.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/engine/DynRetBean.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.engine; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.mvc.service.SwListData; /** diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/flow/BpmFlowListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/flow/BpmFlowListService.java index 8c85222..03d0c67 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/flow/BpmFlowListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/flow/BpmFlowListService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.flow; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskCardService.java index 554cf69..1da9ce2 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskCardService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskCardService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.task.service; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.common.SwEnum; import cc.smtweb.framework.core.db.vo.ModelField; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskListService.java index 8c2e286..be7e6c3 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskListService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.task.service; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskUserListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskUserListService.java index a57dacd..819f38a 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskUserListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/task/service/BpmTaskUserListService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.task.service; -import cc.smtweb.framework.core.R; +import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/DatasetService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/DatasetService.java index dbf8969..c069039 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/DatasetService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/DatasetService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.ui; -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.system.bpm.core.ui.BpmPageContext; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/AbstractJsonDatasetPlugin.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/AbstractJsonDatasetPlugin.java index 3f2ed54..560e689 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/AbstractJsonDatasetPlugin.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/AbstractJsonDatasetPlugin.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.ui.dao; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.db.sqlbuilder.SelectSqlBuilder; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetCardDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetCardDao.java index 6efefd7..b0eee7e 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetCardDao.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetCardDao.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.ui.dao; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.annotation.SwBean; import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetListDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetListDao.java index 07bc390..4e6d924 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetListDao.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetListDao.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.ui.dao; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.annotation.SwBean; import cc.smtweb.framework.core.db.sqlbuilder.SelectSqlBuilder; import cc.smtweb.system.bpm.core.ui.BpmKeyValue; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetTreeDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetTreeDao.java index fabdcb0..25bd8bc 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetTreeDao.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dao/JsonDatasetTreeDao.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.ui.dao; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.annotation.SwBean; import cc.smtweb.framework.core.util.JsonUtil; import cc.smtweb.system.bpm.core.ui.BpmPageContext; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormPageService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormPageService.java index 6e2e185..ad517cd 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormPageService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormPageService.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.web.ui.dynform; -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; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/TaskListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/TaskListService.java index f92a905..c5be254 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/TaskListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/TaskListService.java @@ -1,7 +1,7 @@ package cc.smtweb.system.bpm.web.ui.dynform; -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.SwParam; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java b/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java index 0f4085f..c408dcb 100644 --- a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java +++ b/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/BpmTest.java @@ -1,7 +1,7 @@ package cc.smtweb.system.bpm.test; -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.mvc.controller.MethodAccessManager; import cc.smtweb.system.bpm.spring.BpmApplication; import org.junit.jupiter.api.Assertions; diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java b/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java index 00c2f77..28baf09 100644 --- a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java +++ b/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/ModelFormTest.java @@ -1,11 +1,7 @@ package cc.smtweb.system.bpm.test; -import cc.smtweb.framework.core.CoreApplication; -import cc.smtweb.framework.core.R; -import cc.smtweb.framework.core.SwMap; -import cc.smtweb.framework.core.annotation.SwParam; -import cc.smtweb.framework.core.session.UserSession; -import cc.smtweb.framework.core.util.SpringUtil; +import cc.smtweb.framework.core.common.R; +import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.system.bpm.spring.BpmApplication; import cc.smtweb.system.bpm.web.engine.DynPageService; import org.junit.Test; @@ -13,9 +9,6 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; -import java.util.HashMap; -import java.util.Map; - /** * Created by Akmm at 2022/4/26 9:46 */ diff --git a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java b/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java index 40b7eea..ad0990f 100644 --- a/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java +++ b/smtweb-system/sw-system-bpm/src/test/java/cc/smtweb/system/bpm/test/SpelTest.java @@ -1,6 +1,6 @@ package cc.smtweb.system.bpm.test; -import cc.smtweb.framework.core.SwMap; +import cc.smtweb.framework.core.common.SwMap; import lombok.Data; import org.junit.jupiter.api.Test; import org.springframework.expression.Expression;