From 18caf23b489ef0bd8d09e36f1880099965c449ba Mon Sep 17 00:00:00 2001 From: zhenggm Date: Mon, 21 Mar 2022 09:56:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../smtweb/framework/core/cache/AbstractCache.java | 13 +- .../core/db/cache/ModelDatabaseCache.java | 6 +- .../framework/core/db/cache/ModelTableCache.java | 4 +- .../smtweb/framework/core/db/jdbc/AbsDbWorker.java | 13 ++ .../smtweb/framework/core/db/jdbc/IDbWorker.java | 15 +++ .../smtweb/framework/core/db/jdbc/JdbcEngine.java | 77 +++++++++++- .../smtweb/framework/core/db/jdbc/JdbcTrans.java | 117 +++++++++++------- .../smtweb/framework/core/db/vo/def/FieldType.java | 2 + .../smtweb/framework/core/db/vo/def/TableType.java | 14 +++ .../core/mvc/service/AbstractCompService.java | 59 +++++++-- .../core/mvc/service/AbstractDelHandler.java | 5 +- .../core/mvc/service/AbstractListHandler.java | 137 +++++++-------------- .../core/mvc/service/AbstractLoadHandler.java | 6 +- .../core/mvc/service/AbstractSaveHandler.java | 45 +++++-- .../core/mvc/service/DefaultSaveHandler.java | 67 +++++++++- .../framework/core/mvc/service/IHandler.java | 3 +- .../framework/core/mvc/service/TreeHelper.java | 83 +++++++++++++ .../bpm/core/ui/bind/BpmPageContextEditor.java | 2 - .../bpm/core/ui/builder/CardDataBuilder.java | 2 +- .../bpm/core/ui/builder/CardTreeDataBuilder.java | 5 +- .../bpm/core/ui/builder/TreeDataBuilder.java | 2 +- .../system/bpm/core/ui/entity/form/BpmWidget.java | 1 - .../service/card/AbstractDatasetCardService.java | 1 - .../service/list/AbstractDatasetListService.java | 1 - .../core/ui/service/list/DatasetListWorker.java | 2 +- .../process/impl/AbstractTaskCardService.java | 2 +- .../bpm/engine/process/impl/dao/TaskDao.java | 6 +- .../engine/process/impl/entity/ProcessLogPO.java | 2 - .../bpm/engine/process/impl/entity/ProcessPO.java | 2 - .../bpm/engine/process/runtime/ProcessInfo.java | 2 - .../engine/process/runtime/ProcessInstance.java | 2 +- .../system/bpm/engine/process/task/TaskInfo.java | 2 - .../system/bpm/engine/ui/codegen/VmTool.java | 1 - .../engine/ui/loader/json/JsonDatasetDecoder.java | 6 +- .../system/bpm/spring/BpmAutoConfiguration.java | 1 - .../system/bpm/spring/ProcessEngineImpl.java | 3 +- .../action/service/BpmActionCardService.java | 2 +- .../action/service/BpmActionListService.java | 2 +- .../action/service/BpmActionTreeService.java | 2 +- .../system/bpm/spring/cache/BpmPageCache.java | 2 +- .../bpm/spring/dao/AbstractDatasetPlugin.java | 1 - .../system/bpm/spring/dao/DatasetListDao.java | 4 +- .../system/bpm/spring/dao/DatasetTreeDao.java | 2 +- .../bpm/web/design/catalog/ModelCatalog.java | 88 +++++++++++++ .../web/design/catalog/ModelCatalogService.java | 32 +++++ .../web/design/codegen/AbstractCodeService.java | 2 +- .../bpm/web/design/codegen/JavaCodeService.java | 4 +- .../bpm/web/design/model/AspDbCardService.java | 2 +- .../bpm/web/design/model/AspModelCardService.java | 4 +- .../web/design/model/AspModelConfigService.java | 2 +- .../web/design/model/AspModelExportService.java | 2 +- .../modelcatalog/AspModelCatalogListService.java | 1 - .../web/design/preview/PreviewAppListService.java | 3 - .../web/design/project/ModelProjectService.java | 10 +- .../bpm/web/task/service/BpmTaskCardService.java | 1 - .../bpm/web/ui/dynform/DynFormCardService.java | 2 +- .../bpm/web/ui/dynform/DynFormListService.java | 3 +- .../src/main/resources/codegen/vm/events.ts.vm | 2 - .../src/main/resources/codegen/vm/index.vue.vm | 8 +- .../cc/smtweb/system/bpm/test/BuildJavaBean.java | 19 ++- .../system/bpm/test/codegen/test/VuegenTest.java | 1 - .../bpm/test/codegen/test/YamlToJsonTest.java | 7 +- 62 files changed, 660 insertions(+), 259 deletions(-) create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/TableType.java create mode 100644 smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java create mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalog.java create mode 100644 smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalogService.java diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java index cf2f76c..daa5ac1 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/cache/AbstractCache.java @@ -30,6 +30,9 @@ import java.util.concurrent.TimeUnit; */ @Slf4j public abstract class AbstractCache implements ISwCache { + //树节点按parent的key + public static final String KEY_PARENT_ID = "pr"; + protected final static int LS_NONE = 0; protected final static int LS_LOADING = 1; protected final static int LS_LOADED = 2; @@ -238,7 +241,7 @@ public abstract class AbstractCache implements ISwCache< * @param key * @return */ - protected T getForRemove(String key) { + public T getOrg(String key) { return cacheOrg.get(key); } @@ -248,7 +251,7 @@ public abstract class AbstractCache implements ISwCache< * @param key */ protected void doRemove(String key) { - T bean = getForRemove(key); + T bean = getOrg(key); if (bean != null) { for (Map.Entry> entry : mapListReg.entrySet()) { doRemoveList(entry.getKey(), getBeanKey(entry.getValue(), bean), bean); @@ -334,7 +337,7 @@ public abstract class AbstractCache implements ISwCache< */ public final void reset(T bean) { final String id = getId(bean); - T b = getForRemove(id); + T b = getOrg(id); if (b != null) { cache.put(id, b); } @@ -356,7 +359,7 @@ public abstract class AbstractCache implements ISwCache< * @param key * @return */ - protected final T localGetByKey(String rk, String key) { + protected final T getByKey(String rk, String key) { Map map = mapMapLocal.get(rk); if (map != null) { return map.get(key); @@ -364,7 +367,7 @@ public abstract class AbstractCache implements ISwCache< return null; } - public final Set localGetListByKey(String rk, String key) { + public final Set getListByKey(String rk, String key) { return mapListLocal.get(rk + split_char + key); } diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java index b19c1fa..723163c 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelDatabaseCache.java @@ -6,11 +6,7 @@ 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.vo.ModelDatabase; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.jdbc.core.RowMapper; -import java.sql.ResultSet; -import java.sql.SQLException; import java.util.List; /** @@ -40,6 +36,6 @@ public class ModelDatabaseCache extends AbstractCache { } public final ModelDatabase getByName(String key) { - return localGetByKey(mk, key); + return getByKey(mk, key); } } diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java index e572e99..7e7b0bb 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/cache/ModelTableCache.java @@ -85,9 +85,9 @@ public class ModelTableCache extends AbstractCache { } public final ModelTable getByName(String key) { - return localGetByKey(mk, key.toUpperCase()); + return getByKey(mk, key.toUpperCase()); } public final Set getDbTables(long dbId) { - return localGetListByKey(md, String.valueOf(dbId)); + return getListByKey(md, String.valueOf(dbId)); } } diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java new file mode 100644 index 0000000..a88be21 --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java @@ -0,0 +1,13 @@ +package cc.smtweb.framework.core.db.jdbc; + +/** + * Created by Akmm at 14-2-15 下午1:51 + * 数据库事务操作方法类 + */ +public abstract class AbsDbWorker implements IDbWorker { + @Override + public void doAfterDbCommit() throws Exception {} + + @Override + public void doAfterDbRollback() throws Exception {} +} 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 new file mode 100644 index 0000000..6dca47c --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java @@ -0,0 +1,15 @@ +package cc.smtweb.framework.core.db.jdbc; + +/** + * Created by Akmm at 14-2-3 下午4:52 + * 数据库事务操作方法类 + */ +public interface IDbWorker { + public void work() throws Exception; + + //数据库提交完后的业务或缓存处理 + public void doAfterDbCommit() throws Exception; + + //数据库回滚后的业务或缓存处理 + public void doAfterDbRollback() throws Exception; +} 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 42636da..887f3ac 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 @@ -13,14 +13,15 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.ResultSetExtractor; import org.springframework.jdbc.core.RowMapper; 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; import java.sql.SQLException; -import java.util.HashSet; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; import java.util.function.Function; import java.util.function.Supplier; @@ -30,6 +31,7 @@ import java.util.function.Supplier; public class JdbcEngine { private final static String DB_TYPE_MYSQL = "mysql"; + private Map mapThreadTrans = new ConcurrentHashMap<>(); private JdbcTemplate jdbcTemplate; private DataSourceTransactionManager dataSourceTransactionManager; private IdGenerator idGenerator; @@ -321,6 +323,73 @@ public class JdbcEngine { return false; } + public void beginTrans() throws Exception { + Thread t = Thread.currentThread(); + JdbcTrans jdbcTrans = mapThreadTrans.get(t); + if (jdbcTrans != null) { + jdbcTrans.inc(); + return; + } + mapThreadTrans.put(t, openTrans()); + } + + public void commit() throws Exception { + Thread t = Thread.currentThread(); + JdbcTrans tm = this.mapThreadTrans.get(t); + if (tm == null) throw new Exception("当前没有开启事务。"); + if (tm.canCommit()) { + tm.doEnd("commit"); + tm.commit(); + this.mapThreadTrans.remove(t); + } + } + + public void recTransLog() { + for (JdbcTrans tm: mapThreadTrans.values()) { + tm.doEnd("process"); + } + } + + public void rollback(Exception e) throws Exception { + Thread t = Thread.currentThread(); + JdbcTrans tm = mapThreadTrans.get(t); + if (tm == null) throw new Exception("当前没有开启事务。"); + if (tm.canCommit()) { + tm.doEnd("rollback"); + mapThreadTrans.remove(t); + tm.rollback(); + } + if (e != null) throw e; + } + + public void doTrans(IDbWorker dbWorker) throws Exception { + beginTrans(); + try { + dbWorker.work(); + commit(); + } catch (Exception e) { + rollback(e); + dbWorker.doAfterDbRollback(); + throw e; + } + dbWorker.doAfterDbCommit(); + } + + //独立事务 + public void doTransSingle(IDbWorker worker) throws Exception { + JdbcTrans jdbcTrans = openTrans(); + try { + worker.work(); + jdbcTrans.commit(); + } catch (Exception e) { + jdbcTrans.rollback(); + worker.doAfterDbRollback(); + throw e; + } + worker.doAfterDbCommit(); + } + + /** * 获取原始数据库连接执行命令 * diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcTrans.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcTrans.java index 4639aa2..31a6c33 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcTrans.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/jdbc/JdbcTrans.java @@ -1,56 +1,87 @@ package cc.smtweb.framework.core.db.jdbc; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.DefaultTransactionDefinition; +import java.util.concurrent.atomic.AtomicInteger; + /** * JDBC事务处理类，可以在try中使用自动结束事务 + * * @author xkliu */ public class JdbcTrans implements AutoCloseable { - private DataSourceTransactionManager transactionManager; - private TransactionStatus status; - - /** - * 构造事务执行 - * @param transactionManager spring事务管理对象 - */ - public JdbcTrans(DataSourceTransactionManager transactionManager) { - this.transactionManager = transactionManager; - // 事务定义类 - DefaultTransactionDefinition def = new DefaultTransactionDefinition(); - def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); - // 返回事务对象 - this.status = transactionManager.getTransaction(def); - } - - /** - * 回滚事务 - */ - public void rollback() { - if (status != null) { - transactionManager.rollback(status); - status = null; - } - } - - /** - * 提交事务 - */ - public void commit() { - if (status != null) { - transactionManager.commit(status); - status = null; - } - } - - /** - * 实现自动关闭，回滚方式结束事务 - */ - @Override - public void close() { - this.rollback(); - } + + private Logger logger = LoggerFactory.getLogger("trans"); + protected long time = System.currentTimeMillis(); + protected String info = Thread.currentThread().getStackTrace()[6].getFileName() + "::::" + Thread.currentThread().getStackTrace()[6].getLineNumber(); + private AtomicInteger count = new AtomicInteger(1); + + public int getCount() { + return count.get(); + } + + public void inc() { + count.incrementAndGet(); + } + + public boolean canCommit() { + return count.decrementAndGet() == 0; + } + + public void doEnd(String ei) { + long t = System.currentTimeMillis() - time; + if (t > 10000L) { + logger.info(info + "::::::" + t + "::::::" + ei); + } + } + + private DataSourceTransactionManager transactionManager; + private TransactionStatus status; + + /** + * 构造事务执行 + * + * @param transactionManager spring事务管理对象 + */ + public JdbcTrans(DataSourceTransactionManager transactionManager) { + this.transactionManager = transactionManager; + // 事务定义类 + DefaultTransactionDefinition def = new DefaultTransactionDefinition(); + def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED); + // 返回事务对象 + this.status = transactionManager.getTransaction(def); + } + + /** + * 回滚事务 + */ + public void rollback() { + if (status != null) { + transactionManager.rollback(status); + status = null; + } + } + + /** + * 提交事务 + */ + public void commit() { + if (status != null) { + transactionManager.commit(status); + status = null; + } + } + + /** + * 实现自动关闭，回滚方式结束事务 + */ + @Override + public void close() { + this.rollback(); + } } diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/FieldType.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/FieldType.java index c88ebff..30cc8f4 100644 --- a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/FieldType.java +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/FieldType.java @@ -9,6 +9,8 @@ public enum FieldType { ID, // 上级ID，树结构需要 PARENT_ID, + //级次码 + LEVEL_CODE, // 排序字段，树结构需要 ORDER, // 编码字段 diff --git a/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/TableType.java b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/TableType.java new file mode 100644 index 0000000..d75c0ca --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/db/vo/def/TableType.java @@ -0,0 +1,14 @@ +package cc.smtweb.framework.core.db.vo.def; + +/** + * Created by Akmm at 2022/3/17 17:02 + */ +public class TableType { + //0-普通表，1 树型表 2 编码表 9-虚拟抽象表 11 视图 + public static final int TYPE_GENERAL = 0; + public static final int TYPE_TREE = 1; + public static final int TYPE_CODE = 2; + public static final int TYPE_ABSTACT = 3; + public static final int TYPE_VIEW = 3; + +} 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 da7ee9d..8061e71 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,6 +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.SwMap; import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwService; @@ -17,45 +18,83 @@ import java.util.Map; */ public abstract class AbstractCompService { public final static String TYPE_LIST = "list"; + public final static String TYPE_COMBO = "combo"; + public final static String TYPE_TREE = "tree"; public final static String TYPE_LOAD = "load"; public final static String TYPE_SAVE = "save"; public final static String TYPE_DEL = "del"; protected abstract IHandler createHanlder(String type); - private R pageHandler(SwMap params, UserSession us, String type) { - try { - IHandler handler = createHanlder(type); + private IHandler getHandler(SwMap params, UserSession us, String type) throws Exception { + IHandler handler = createHanlder(type); + if (handler == null) throw new SwException("暂不支持此类服务：" + type); if (params == null) params = new SwMap(); if (us == null) us = UserSession.createSys(); - return handler.doWork(params, us); + handler.init(params, us); + return handler; + } + + private R pageHandler(SwMap params, UserSession us, String type) { + try { + IHandler handler = getHandler(params, us, type); + return handler.doWork(); } catch (Exception e) { return R.error("操作失败！", e); } } + //保存 public R save(@SwBody SwMap params, UserSession us) { return pageHandler(params, us, TYPE_SAVE); } + //树，换爹 + public R trcp(@SwBody SwMap params, UserSession us) { + try { + DefaultSaveHandler handler = (DefaultSaveHandler)getHandler(params, us,TYPE_SAVE); + return handler.changeParent(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } + + //读取 public R load(@SwBody SwMap params, UserSession us) { return pageHandler(params, us, TYPE_LOAD); } - + //删除 public R del(@SwBody SwMap params, UserSession us) { return pageHandler(params, us, TYPE_DEL); } - + //列表数据 public R list(@SwBody SwMap params, UserSession us) { return pageHandler(params, us, TYPE_LIST); } - - public R getTotal(@SwBody SwMap params, UserSession us) { + //列表总记录数及合计栏 + public R listTotal(@SwBody SwMap params, UserSession us) { try { - AbstractListHandler handler = (AbstractListHandler)createHanlder(TYPE_LIST); - return handler.getTotal(params, us); + AbstractListHandler handler = (AbstractListHandler)getHandler(params, us, TYPE_LIST); + return handler.getTotal(); } catch (Exception e) { return R.error("操作失败！", e); } } + //combo数据 + public R combo(@SwBody SwMap params, UserSession us) { + return pageHandler(params, us, TYPE_COMBO); + } + //combo总记录数及合计栏 + public R comboTotal(@SwBody SwMap params, UserSession us) { + try { + AbstractListHandler handler = (AbstractListHandler)getHandler(params, us, TYPE_COMBO); + return handler.getTotal(); + } catch (Exception e) { + return R.error("操作失败！", e); + } + } + //树数据 + public R tree(@SwBody SwMap params, UserSession us) { + return pageHandler(params, us, TYPE_TREE); + } } 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 b1e6e21..cb1ece6 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 @@ -17,10 +17,13 @@ public abstract class AbstractDelHandler implements IHandler{ protected long id; @Override - public R doWork(SwMap params, UserSession us) throws Exception { + public void init(SwMap params, UserSession us) { this.params = params; this.us = us; + } + @Override + public R doWork() throws Exception { id = readId(); checkValid(); 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 a8079cf..e318bed 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 @@ -7,10 +7,8 @@ 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 cc.smtweb.framework.core.util.NumberUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.ResultSetExtractor; import java.sql.ResultSet; @@ -32,24 +30,46 @@ public abstract class AbstractListHandler implements IHandler { protected SwMap params; protected UserSession us; - private SessionCache cacheBean; - private List footerFields = null; - -// private SqlPara sqlPara = null; + private SessionCache sessionCache; @Override - public R doWork(SwMap params, UserSession us) throws Exception { + public void init(SwMap params, UserSession us) { this.params = params; this.us = us; + } + @Override + public R doWork() throws Exception { return R.success(listData()); } + protected String getCompId() { + return this.getClass().getSimpleName(); + } + + protected T getCache(String key) { + if (sessionCache == null) + sessionCache = SessionCacheFactory.getInstance().getUserCache(us.getUserId()); + return sessionCache.get(getCompId() + "." + key); + } + + protected void setCache(String key, Object v) { + if (sessionCache == null) + sessionCache = SessionCacheFactory.getInstance().getUserCache(us.getUserId()); + sessionCache.put(getCompId() + "." + key, v); + } + + protected void removeCache(String key) { + if (sessionCache == null) + sessionCache = SessionCacheFactory.getInstance().getUserCache(us.getUserId()); + sessionCache.remove(getCompId() + "." + key); + } + protected SwListData listData() throws Exception { List listData = new ArrayList<>(); SqlPara sqlPara = buildDataSql(); - int rows = params.readInt("rows", 20); + int rows = params.readInt("rows", 0); int page = params.readInt("page", 1); String sort = params.readString("sort"); String order = params.readString("order"); @@ -74,13 +94,12 @@ public abstract class AbstractListHandler implements IHandler { } protected SqlPara buildSumSqlPara() { - final SessionCache userCache = getCacheBean(); - SqlPara sqlPara = userCache.get(KEY_SQLPARA); + SqlPara sqlPara = getCache(KEY_SQLPARA); if (sqlPara == null) return null; - getFooterFields(); + List footerFields = getFooterFields(); StringBuilder sql = new StringBuilder(128); - sql.append("select count(1) F_1"); + sql.append("select count(1) total_count"); int n = 2; for (FooterField cn : footerFields) { if (!FooterField.STATIC_TEXT.equals(cn.type)) { @@ -93,7 +112,7 @@ public abstract class AbstractListHandler implements IHandler { } if (FooterField.SUM_TYPE_COUNT.equals(cn.type)) sql.append("distinct "); - sql.append(cn.field).append(") F_").append(n++); + sql.append(cn.field).append(") ").append(cn.field); } } sql.append(" from (").append(sqlPara.getSqlNoOrderBy()).append(") xxxxxz"); @@ -101,70 +120,21 @@ public abstract class AbstractListHandler implements IHandler { return new SqlPara(sql.toString(), sqlPara.paras); } - public R getTotal(SwMap params, UserSession us) { + public R getTotal() { try { - this.params = params; - this.us = us; - - final SessionCache userCache = getCacheBean(); - SqlPara sqlParaSum = userCache.get(KEY_SQLPARA_SUM); + SqlPara sqlParaSum = getCache(KEY_SQLPARA_SUM); if (sqlParaSum == null) { - Map map = userCache.get(KEY_PARAMS); + Map map = getCache(KEY_PARAMS); if (map != null) params.putAll(map); sqlParaSum = buildSumSqlPara(); } if (sqlParaSum == null) return R.success(); - userCache.put(KEY_SQLPARA_SUM, sqlParaSum); - + setCache(KEY_SQLPARA_SUM, sqlParaSum); - Map mapFooter = new HashMap<>(); - getFooterFields(); - - int total = DbEngine.getInstance().query(sqlParaSum.sql, new ResultSetExtractor() { - public Integer extractData(ResultSet rs) throws SQLException { - try { - for (FooterField c : footerFields) { - if (FooterField.STATIC_TEXT.equals(c.type)) - mapFooter.put(c.field, c.text); - } - int count = 0; - - if (rs.next()) { - count = rs.getInt(1); - int n = 2; - for (FooterField c : footerFields) { - switch (c.type) { - case FooterField.STATIC_TEXT: - mapFooter.put(c.field, c.text); - break; - case FooterField.SUM_TYPE_COUNT: - case FooterField.SUM_TYPE_COUNT_ALL: - mapFooter.put(c.field, String.valueOf(rs.getInt(n++))); - break; - case FooterField.SUM_TYPE_SUM_NUM: - mapFooter.put(c.field, String.valueOf(rs.getInt(n++))); - break; - default: - mapFooter.put(c.field, rs.getDouble(n++)); - break; - } - } - } else { - for (FooterField c : footerFields) { - if (FooterField.STATIC_TEXT.equals(c.type)) - mapFooter.put(c.field, c.text); - } - } - return count; - } catch (Exception e) { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - return 0; - } - } - }, sqlParaSum.paras); + Map mapFooter = DbEngine.getInstance().queryEntity(sqlParaSum.sql, Map.class, sqlParaSum.paras); R r = R.success(); - r.put("total", total); + r.put("total", mapFooter.get("total_count")); r.put("footer", mapFooter); return r; } catch (Exception e) { @@ -172,25 +142,12 @@ public abstract class AbstractListHandler implements IHandler { } } - - public SessionCache getCacheBean() { - if (cacheBean == null) - cacheBean = SessionCacheFactory.getInstance().getUserCache(us.getUserId()); - return cacheBean; - } - - public void clearCache() { - getCacheBean().clear(); - } - protected SqlPara buildDataSql() throws Exception { - SessionCache userCache = getCacheBean(); - //从缓存里看看有没有保存的sql缓存； - SqlPara sqlParaInCache = getCacheBean().get(KEY_SQLPARA); //缓存里面的对象； + SqlPara sqlParaInCache = getCache(KEY_SQLPARA); //缓存里面的对象； boolean query = sqlParaInCache == null || params.readBool("query"); if (!query) { - Map map = userCache.get(KEY_PARAMS); + Map map = getCache(KEY_PARAMS); if (map == null) query = true; else { Map params = getCachedParams(); @@ -214,14 +171,14 @@ public abstract class AbstractListHandler implements IHandler { //缓存里面没有对象，重新构建查询条件，重新计算汇总数； buildParam();//构造过滤条件，设默认值 sqlPara = buildSqlPara(); //重新构建查询对象； - userCache.remove(KEY_SQLPARA_SUM); + removeCache(KEY_SQLPARA_SUM); - userCache.put(KEY_SQLPARA, sqlPara); - userCache.put(KEY_PARAMS, getCachedParams());//不缓存页码之类的东东，避免下次请求时，页码又回去了 + setCache(KEY_SQLPARA, sqlPara); + setCache(KEY_PARAMS, getCachedParams());//不缓存页码之类的东东，避免下次请求时，页码又回去了 } else { sqlPara = sqlParaInCache; - Map map = userCache.get(KEY_PARAMS); + Map map = getCache(KEY_PARAMS); if (map != null) params.putAll(map); } return sqlPara; @@ -252,10 +209,8 @@ public abstract class AbstractListHandler implements IHandler { //构建合计字段 private List getFooterFields() { - if (footerFields == null) { - footerFields = new ArrayList<>(); - buildFooterFields(footerFields); - } + List footerFields = new ArrayList<>(); + buildFooterFields(footerFields); return footerFields; } 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 998b7cc..e6a85b9 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 @@ -12,9 +12,13 @@ public abstract class AbstractLoadHandler implements IHandler { protected UserSession us; @Override - public R doWork(SwMap params, UserSession us) throws Exception { + public void init(SwMap params, UserSession us) { this.params = params; this.us = us; + } + + @Override + public R doWork() throws Exception { long id = readId(); T bean; if (id <= 0L) { 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 1f30e59..b5ead60 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,8 +1,10 @@ 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.db.DbEngine; +import cc.smtweb.framework.core.db.jdbc.AbsDbWorker; import cc.smtweb.framework.core.session.UserSession; import lombok.extern.slf4j.Slf4j; @@ -11,17 +13,20 @@ import lombok.extern.slf4j.Slf4j; * 保存 */ @Slf4j -public abstract class AbstractSaveHandler implements IHandler{ +public abstract class AbstractSaveHandler implements IHandler { protected SwMap params; protected UserSession us; protected T bean; protected boolean isNew; @Override - public R doWork(SwMap params, UserSession us) throws Exception { + public void init(SwMap params, UserSession us) { this.params = params; this.us = us; + } + @Override + public R doWork() throws Exception { long id = readId(); isNew = id <= 0L; @@ -32,15 +37,20 @@ public abstract class AbstractSaveHandler implements IHandler{ } readFromPage(); checkValid(); - DbEngine.getInstance().doTrans(() -> { - try { + DbEngine.getInstance().doTrans(new AbsDbWorker() { + @Override + public void work() throws Exception { save(); + } + + @Override + public void doAfterDbCommit() throws Exception { saveSuccess(); - return true; - } catch (Exception e) { + } + + @Override + public void doAfterDbRollback() throws Exception { saveFailed(); - log.error("保存失败！", e); - return false; } }); return R.success(bean); @@ -48,18 +58,33 @@ public abstract class AbstractSaveHandler implements IHandler{ /** * 读取页面传回来的id + * * @return */ protected long readId() { return params.readLong("id", 0L); } + //从页面读取数据 protected abstract void readFromPage(); + + //保存前的校验 protected abstract void checkValid() throws Exception; + + //保存到数据库 protected abstract void save() throws Exception; - protected void saveSuccess() {} - protected void saveFailed() {} + //保存成功之后 + protected void saveSuccess() { + } + + //保存失败之后 + protected void saveFailed() { + } + + //构建一个新对象 protected abstract T createComp() throws Exception; + + //从数据库读取 protected abstract T loadComp(long id) throws Exception; } 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 bb22ff6..4c102b3 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,5 +1,6 @@ package cc.smtweb.framework.core.mvc.service; +import cc.smtweb.framework.core.R; import cc.smtweb.framework.core.SwException; import cc.smtweb.framework.core.cache.AbstractCache; import cc.smtweb.framework.core.cache.CacheManager; @@ -7,11 +8,17 @@ 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.jdbc.AbsDbWorker; 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.db.vo.def.FieldType; +import cc.smtweb.framework.core.db.vo.def.TableType; import org.apache.commons.lang3.StringUtils; +import java.util.Collection; +import java.util.List; + /** * Created by Akmm at 2022/3/2 19:52 * 默认实体实现 @@ -19,6 +26,8 @@ import org.apache.commons.lang3.StringUtils; public class DefaultSaveHandler extends AbstractSaveHandler { protected String tableName; + private List listTreeBean = null; + public DefaultSaveHandler(String tableName) { this.tableName = tableName; } @@ -44,14 +53,14 @@ public class DefaultSaveHandler extends AbstractSaveHan @Override protected void checkValid() throws Exception { ModelTable table = ModelTableCache.getInstance().getByName(tableName); - for (ModelField field: table.getFields()) { + for (ModelField field : table.getFields()) { if (field.isNotNull() && StringUtils.isEmpty(bean.getStr(field.getName()))) { throw new SwException(field.getTitle() + "不能为空！"); } } EntityDao dao = DbEngine.getInstance().findDao(tableName); - for (ModelIndex mi: table.getIndexes()) { + for (ModelIndex mi : table.getIndexes()) { if (mi.isUnique()) { dao.checkUnique(bean, mi.getFields().split(",")); } @@ -59,22 +68,32 @@ public class DefaultSaveHandler extends AbstractSaveHan } @Override - protected void save() { - EntityDao dao = DbEngine.getInstance().findDao(tableName); + protected void save() throws Exception { + EntityDao dao = DbEngine.getInstance().findDao(tableName); if (isNew) { dao.insertEntity(bean); } else { dao.updateEntity(bean); + + listTreeBean = new TreeHelper(tableName).resetTreeLevel(bean); } } + @Override protected void saveSuccess() { super.saveSuccess(); ModelTable table = ModelTableCache.getInstance().getByName(tableName); if (table.isNeedCache()) { AbstractCache cache = CacheManager.getIntance().getCache(tableName); - cache.put(bean); + //树型表，父亲改变了，要多处理下缓存；还有个东东：级次码 + if (listTreeBean != null && !listTreeBean.isEmpty()) { + for (T b : listTreeBean) { + cache.put(b); + } + } else { + cache.put(bean); + } } } @@ -87,4 +106,42 @@ public class DefaultSaveHandler extends AbstractSaveHan cache.reset(bean); } } + + //树，改变父亲 + protected R changeParent() throws Exception { + ModelTable table = ModelTableCache.getInstance().getByName(tableName); + if (table.getType() != TableType.TYPE_TREE) throw new SwException("非树型表，不支持更改父节点"); + + long id = params.readLong("id"); + long parentId = params.readLong("parent_id"); + + AbstractCache cache = CacheManager.getIntance().getCache(tableName); + if (table.isNeedCache()) { + bean = cache.get(id); + } else { + bean = loadComp(id); + } + //不考虑没有级次码等情况，这个在表设计时校验 + ModelField fieldParentCode = table.findFieldByType(FieldType.PARENT_ID); + + bean.put(fieldParentCode.getName(), parentId); + DbEngine.getInstance().doTrans(new AbsDbWorker() { + @Override + public void work() throws Exception { + EntityDao dao = DbEngine.getInstance().findDao(tableName); + dao.updateEntity(bean, fieldParentCode.getName()); + } + + @Override + public void doAfterDbCommit() throws Exception { + saveSuccess(); + } + + @Override + public void doAfterDbRollback() throws Exception { + saveFailed(); + } + }); + return R.success(); + } } 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 3ef847e..d374b46 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 @@ -9,5 +9,6 @@ import cc.smtweb.framework.core.session.UserSession; * 所有handler的接口 */ public interface IHandler { - R doWork(SwMap params, UserSession us) throws Exception; + void init(SwMap params, UserSession us); + R doWork() throws Exception; } 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 new file mode 100644 index 0000000..f52dfbe --- /dev/null +++ b/smtweb-framework/sw-framework-core/src/main/java/cc/smtweb/framework/core/mvc/service/TreeHelper.java @@ -0,0 +1,83 @@ +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.ModelTable; +import cc.smtweb.framework.core.db.vo.def.FieldType; +import cc.smtweb.framework.core.db.vo.def.TableType; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +/** + * Created by Akmm at 2022/3/17 19:56 + */ +public class TreeHelper { + + private String tableName; + + private ModelTable table; + private AbstractCache cache; + private EntityDao dao; + + private String fieldParent; + private String fieldLevelCode; + + public TreeHelper(String tableName) { + this.tableName = tableName; + table = ModelTableCache.getInstance().getByName(tableName); + cache = CacheManager.getIntance().getCache(tableName); + dao = DbEngine.getInstance().findDao(tableName); + + ModelField field = table.findFieldByType(FieldType.PARENT_ID); + fieldParent = field.getName(); + field = table.findFieldByType(FieldType.LEVEL_CODE); + fieldLevelCode = field.getName(); + } + + public long getParentId(T bean) { + return bean.getLong(fieldParent); + } + + public String getLevelCode(T bean) { + return bean.getStr(fieldLevelCode); + } + + public Collection getChildren(T bean) { + return cache.getListByKey(AbstractCache.KEY_PARENT_ID, String.valueOf(bean.getEntityId())); + } + + public List resetTreeLevel(T bean) throws Exception { + List list = new ArrayList<>(); + if (table.getType() != TableType.TYPE_TREE) return list; + if (!table.isNeedCache()) throw new SwException("请定义为需要缓存！"); + + T oldBean = cache.get(bean.getEntityId()); + if (bean.getLong(fieldParent) != oldBean.getLong(fieldParent)) { + resetParentChildren(bean, list); + } + return list; + } + + private void resetParentChildren(T bean, List list) throws Exception { + T parent = cache.get(getParentId(bean)); + if (parent != null) { + bean.put(fieldLevelCode, getLevelCode(parent) + "-" + parent.getEntityId()); + dao.updateEntity(bean, fieldLevelCode); + list.add(bean); + } + Collection children = getChildren(bean); + if (children != null && !children.isEmpty()) { + for (T child : children) { + resetParentChildren(child, list); + } + } + } +} 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 d11ce04..0be9f17 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,7 +1,6 @@ package cc.smtweb.system.bpm.core.ui.bind; import cc.smtweb.framework.core.SwMap; -import cc.smtweb.framework.core.cache.CacheManager; import cc.smtweb.framework.core.mvc.controller.IBeanContext; import cc.smtweb.framework.core.mvc.controller.IEditor; import cc.smtweb.system.bpm.core.exception.BpmException; @@ -10,7 +9,6 @@ import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.entity.BpmPage; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.spring.cache.BpmPageCache; -import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import javax.servlet.http.HttpServletRequest; import java.util.Map; 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 148a307..203d70f 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 @@ -8,11 +8,11 @@ import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.framework.core.util.DateUtil; +import cc.smtweb.system.bpm.core.exception.BpmFieldError; import cc.smtweb.system.bpm.core.exception.BpmValidException; import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmField; -import cc.smtweb.system.bpm.core.exception.BpmFieldError; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmFieldLookup; import cc.smtweb.system.bpm.engine.ui.entity.consts.UiEnum; import lombok.Getter; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardTreeDataBuilder.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardTreeDataBuilder.java index 4f87513..c2efec0 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardTreeDataBuilder.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/builder/CardTreeDataBuilder.java @@ -1,7 +1,10 @@ package cc.smtweb.system.bpm.core.ui.builder; import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.framework.core.db.sqlbuilder.*; +import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder; +import cc.smtweb.framework.core.db.sqlbuilder.AbstractUpdateSqlBuilder; +import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; +import cc.smtweb.framework.core.db.sqlbuilder.UpdateSqlBuilder; import cc.smtweb.system.bpm.core.exception.BpmDataException; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.engine.ui.entity.consts.UiEnum; 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 8cd243b..46ca81a 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 @@ -5,8 +5,8 @@ import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; import cc.smtweb.framework.core.util.JsonUtil; import cc.smtweb.system.bpm.core.exception.BpmException; -import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.BpmPageContext; +import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmField; import cc.smtweb.system.bpm.engine.ui.entity.consts.UiEnum; 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 0845b37..d8c5e8f 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 @@ -2,7 +2,6 @@ package cc.smtweb.system.bpm.core.ui.entity.form; import cc.smtweb.framework.core.SwMap; import cc.smtweb.system.bpm.engine.ui.entity.vo.widiget.UiControlDataVO; -import cc.smtweb.system.bpm.engine.ui.entity.vo.widiget.UiControlVO; 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/card/AbstractDatasetCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/core/ui/service/card/AbstractDatasetCardService.java index 32d16c8..9a89ae7 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 @@ -9,7 +9,6 @@ import cc.smtweb.system.bpm.core.ui.dataset.FieldFormatTool; import cc.smtweb.system.bpm.core.ui.dataset.FieldFormatter; import cc.smtweb.system.bpm.core.ui.entity.dataset.*; import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetService; -import cc.smtweb.system.bpm.engine.entity.DictPO; import cc.smtweb.system.bpm.engine.ui.entity.consts.MappingTypeEnum; import cc.smtweb.system.bpm.engine.ui.entity.consts.UiEnum; import org.apache.commons.lang3.StringUtils; 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 417898b..0a7a864 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 @@ -9,7 +9,6 @@ import cc.smtweb.system.bpm.core.ui.dataset.FieldFormatTool; import cc.smtweb.system.bpm.core.ui.dataset.FieldFormatter; import cc.smtweb.system.bpm.core.ui.entity.dataset.*; import cc.smtweb.system.bpm.core.ui.service.AbstractDatasetService; -import cc.smtweb.system.bpm.engine.entity.DictPO; import cc.smtweb.system.bpm.engine.ui.entity.consts.UiEnum; import java.util.*; 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 ce9fb08..77655a1 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,8 +1,8 @@ package cc.smtweb.system.bpm.core.ui.service.list; import cc.smtweb.framework.core.SwMap; -import cc.smtweb.system.bpm.core.ui.BpmPageContext; 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; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmFieldLookup; import cc.smtweb.system.bpm.core.ui.service.DatasetWorker; 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 972f9e5..05198a6 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 @@ -5,9 +5,9 @@ import cc.smtweb.framework.core.SwMap; import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.framework.core.db.vo.ModelField; import cc.smtweb.framework.core.db.vo.ModelTable; +import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.system.bpm.engine.process.impl.entity.CommitTaskVO; import cc.smtweb.system.bpm.engine.process.impl.entity.LoadTaskAckVO; import cc.smtweb.system.bpm.engine.process.impl.entity.LoadTaskVO; 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 6f0936f..049677b 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,17 +1,15 @@ package cc.smtweb.system.bpm.engine.process.impl.dao; import cc.smtweb.framework.core.SwMap; -import cc.smtweb.framework.core.cache.CacheManager; import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.framework.core.db.cache.ModelDatabaseCache; import cc.smtweb.framework.core.db.cache.ModelTableCache; import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.UpdateSqlBuilder; +import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.util.DateUtil; -import cc.smtweb.system.bpm.core.exception.BpmObjectNotFoundException; import cc.smtweb.system.bpm.core.exception.BpmLockRevException; -import cc.smtweb.framework.core.db.vo.ModelTable; +import cc.smtweb.system.bpm.core.exception.BpmObjectNotFoundException; import cc.smtweb.system.bpm.engine.process.impl.entity.ProcessLogPO; import cc.smtweb.system.bpm.engine.process.impl.entity.ProcessPO; import cc.smtweb.system.bpm.engine.process.impl.entity.TaskPO; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessLogPO.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessLogPO.java index 32f6427..5c323f3 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessLogPO.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessLogPO.java @@ -2,8 +2,6 @@ package cc.smtweb.system.bpm.engine.process.impl.entity; import lombok.Data; -import java.sql.Timestamp; - @Data public class ProcessLogPO { private Long plId; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessPO.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessPO.java index c8231ad..961d2f3 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessPO.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/impl/entity/ProcessPO.java @@ -2,8 +2,6 @@ package cc.smtweb.system.bpm.engine.process.impl.entity; import lombok.Data; -import java.sql.Timestamp; - @Data public class ProcessPO { private Long processId; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInfo.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInfo.java index 978b305..378040b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInfo.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInfo.java @@ -2,8 +2,6 @@ package cc.smtweb.system.bpm.engine.process.runtime; import lombok.Data; -import java.sql.Timestamp; - @Data public class ProcessInfo { protected Long id; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInstance.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInstance.java index 60753d5..d2b4a3b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInstance.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/runtime/ProcessInstance.java @@ -1,8 +1,8 @@ package cc.smtweb.system.bpm.engine.process.runtime; +import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.util.JsonUtil; import cc.smtweb.system.bpm.core.exception.BpmObjectNotFoundException; -import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.system.bpm.engine.process.vo.Flow; import cc.smtweb.system.bpm.engine.process.vo.FlowAction; import cc.smtweb.system.bpm.engine.process.vo.FlowConnection; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/task/TaskInfo.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/task/TaskInfo.java index f96ca6f..e2180d0 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/task/TaskInfo.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/process/task/TaskInfo.java @@ -2,8 +2,6 @@ package cc.smtweb.system.bpm.engine.process.task; import lombok.Data; -import java.sql.Timestamp; - @Data public class TaskInfo { protected long id; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/VmTool.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/VmTool.java index 2cf1966..cc09ab8 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/VmTool.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/codegen/VmTool.java @@ -1,7 +1,6 @@ package cc.smtweb.system.bpm.engine.ui.codegen; import cc.smtweb.framework.core.util.jackson.*; -import cc.smtweb.framework.core.db.vo.ModelField; import cc.smtweb.system.bpm.util.CodeGenUtil; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonDatasetDecoder.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonDatasetDecoder.java index 75f027b..c1f5159 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonDatasetDecoder.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/engine/ui/loader/json/JsonDatasetDecoder.java @@ -2,6 +2,9 @@ package cc.smtweb.system.bpm.engine.ui.loader.json; import cc.smtweb.framework.core.db.cache.ModelDatabaseCache; import cc.smtweb.framework.core.db.cache.ModelTableCache; +import cc.smtweb.framework.core.db.vo.ModelDatabase; +import cc.smtweb.framework.core.db.vo.ModelField; +import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.util.MapUtil; import cc.smtweb.system.bpm.core.exception.ModelLoaderError; import cc.smtweb.system.bpm.core.ui.IParamConst; @@ -9,9 +12,6 @@ import cc.smtweb.system.bpm.core.ui.dataset.FieldFormatTool; import cc.smtweb.system.bpm.core.ui.entity.BpmPage; import cc.smtweb.system.bpm.core.ui.entity.dataset.*; import cc.smtweb.system.bpm.engine.AbstractLoader; -import cc.smtweb.framework.core.db.vo.ModelDatabase; -import cc.smtweb.framework.core.db.vo.ModelField; -import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.system.bpm.engine.ui.entity.consts.MappingTypeEnum; import cc.smtweb.system.bpm.engine.ui.entity.consts.UiEnum; import cc.smtweb.system.bpm.engine.ui.entity.vo.dataset.FzDatasetPropsVO; 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 0a6e36a..b643c3d 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 @@ -9,7 +9,6 @@ import cc.smtweb.system.bpm.core.ui.bind.BpmMapAttrEditor; import cc.smtweb.system.bpm.core.ui.bind.BpmPageContextEditor; import cc.smtweb.system.bpm.spring.action.BpmEventDao; import cc.smtweb.system.bpm.spring.action.BpmEventLoader; -import cc.smtweb.system.bpm.spring.cache.BpmPageCache; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/ProcessEngineImpl.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/ProcessEngineImpl.java index f1f9913..55f71d9 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/ProcessEngineImpl.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/ProcessEngineImpl.java @@ -1,8 +1,8 @@ package cc.smtweb.system.bpm.spring; import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.system.bpm.core.exception.BpmObjectNotFoundException; import cc.smtweb.system.bpm.core.exception.BpmIlegalArgumentException; +import cc.smtweb.system.bpm.core.exception.BpmObjectNotFoundException; import cc.smtweb.system.bpm.engine.process.impl.dao.TaskDao; import cc.smtweb.system.bpm.engine.process.impl.entity.CommitTaskUserVO; import cc.smtweb.system.bpm.engine.process.runtime.*; @@ -13,7 +13,6 @@ import cc.smtweb.system.bpm.engine.process.vo.FlowConnection; import cc.smtweb.system.bpm.engine.process.vo.FlowNode; import cc.smtweb.system.bpm.engine.ui.IFormDataStore; import cc.smtweb.system.bpm.engine.ui.impl.FormDataStoreImpl; -import cc.smtweb.system.bpm.spring.cache.BpmFlowCache; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionCardService.java index 548c69e..a340e6b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionCardService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionCardService.java @@ -4,8 +4,8 @@ import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.system.bpm.core.ui.BpmPageContext; import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker; import cc.smtweb.system.bpm.core.ui.service.card.AbstractDatasetCardService; -import cc.smtweb.system.bpm.core.ui.service.card.DatasetCardWorker; import cc.smtweb.system.bpm.core.ui.service.card.DatasetCardAgentWorker; +import cc.smtweb.system.bpm.core.ui.service.card.DatasetCardWorker; import cc.smtweb.system.bpm.spring.dao.DatasetCardDao; import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import lombok.Setter; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionListService.java index 5a1eba2..928e67f 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionListService.java @@ -4,8 +4,8 @@ import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.system.bpm.core.ui.BpmPageContext; import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker; import cc.smtweb.system.bpm.core.ui.service.list.AbstractDatasetListService; -import cc.smtweb.system.bpm.core.ui.service.list.DatasetListWorker; import cc.smtweb.system.bpm.core.ui.service.list.DatasetListAgentWorker; +import cc.smtweb.system.bpm.core.ui.service.list.DatasetListWorker; import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import cc.smtweb.system.bpm.spring.dao.DatasetListDao; import lombok.Setter; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionTreeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionTreeService.java index 7b51f1b..278a251 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionTreeService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/action/service/BpmActionTreeService.java @@ -4,8 +4,8 @@ import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.system.bpm.core.ui.BpmPageContext; import cc.smtweb.system.bpm.core.ui.service.DatasetApiInvoker; import cc.smtweb.system.bpm.core.ui.service.tree.AbstractDatasetTreeService; -import cc.smtweb.system.bpm.core.ui.service.tree.DatasetTreeWorker; import cc.smtweb.system.bpm.core.ui.service.tree.DatasetTreeAgentWorker; +import cc.smtweb.system.bpm.core.ui.service.tree.DatasetTreeWorker; import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import cc.smtweb.system.bpm.spring.dao.DatasetTreeDao; import lombok.Setter; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/cache/BpmPageCache.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/cache/BpmPageCache.java index 7b44065..13ba35b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/cache/BpmPageCache.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/cache/BpmPageCache.java @@ -145,7 +145,7 @@ public class BpmPageCache extends AbstractCache { } public BpmPage getByOtherKey(String otherKey) { - BpmPage bean = localGetByKey(fn, otherKey); + BpmPage bean = getByKey(fn, otherKey); if (bean == null) { bean = loadFromOtherKey(otherKey); if (bean != null) { 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 f6c82ac..e1050ed 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,7 +1,6 @@ package cc.smtweb.system.bpm.spring.dao; import cc.smtweb.framework.core.SwMap; -import cc.smtweb.framework.core.annotation.SwParam; 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/DatasetListDao.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/spring/dao/DatasetListDao.java index a91ac14..46172b2 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 @@ -2,10 +2,10 @@ package cc.smtweb.system.bpm.spring.dao; import cc.smtweb.framework.core.SwMap; import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder; -import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.BpmKeyValue; -import cc.smtweb.system.bpm.core.ui.BpmPageContext; import cc.smtweb.system.bpm.core.ui.BpmMapData; +import cc.smtweb.system.bpm.core.ui.BpmPageContext; +import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.builder.SqlUtil; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmFieldFilter; 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 feb4caf..acf4d3e 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 @@ -2,8 +2,8 @@ package cc.smtweb.system.bpm.spring.dao; import cc.smtweb.framework.core.SwMap; import cc.smtweb.framework.core.db.sqlbuilder.AbstractSelectSqlBuilder; -import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.BpmPageContext; +import cc.smtweb.system.bpm.core.ui.IParamConst; import cc.smtweb.system.bpm.core.ui.builder.TreeDataBuilder; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.engine.entity.AspModelTreeVO; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalog.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalog.java new file mode 100644 index 0000000..9381b4d --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalog.java @@ -0,0 +1,88 @@ +package cc.smtweb.system.bpm.web.design.catalog; + +import cc.smtweb.framework.core.annotation.SwTable; +import cc.smtweb.framework.core.db.impl.DefaultEntity; + +/** + * Created by Akmm at 2022/3/1 15:35 + */ +@SwTable("ASP_MODEL_CATALOG") +public class ModelCatalog extends DefaultEntity { + public static final String ENTITY_NAME = "ASP_MODEL_CATALOG"; + + public ModelCatalog() { + super(ENTITY_NAME); + } + + private long getMcId() { + return getLong("mc_id"); + } + + private void setMcId(long mcId) { + put("mc_id", mcId); + } + + private long getMcParentId() { + return getLong("mc_parent_id"); + } + + private void setMcParentId(long mcParentId) { + put("mc_parent_id", mcParentId); + } + + private String getMcCode() { + return getStr("mc_code"); + } + + private void setMcCode(String mcCode) { + put("mc_code", mcCode); + } + + private String getMcName() { + return getStr("mc_name"); + } + + private void setMcName(String mcName) { + put("mc_name", mcName); + } + + private long getMcPrjId() { + return getLong("mc_prj_id"); + } + + private void setMcPrjId(long mcPrjId) { + put("mc_prj_id", mcPrjId); + } + + private long getMcCreateUid() { + return getLong("mc_create_uid"); + } + + private void setMcCreateUid(long mcCreateUid) { + put("mc_create_uid", mcCreateUid); + } + + private long getMcUpdateUid() { + return getLong("mc_update_uid"); + } + + private void setMcUpdateUid(long mcUpdateUid) { + put("mc_update_uid", mcUpdateUid); + } + + private long getMcCreateAt() { + return getLong("mc_create_at"); + } + + private void setMcCreateAt(long mcCreateAt) { + put("mc_create_at", mcCreateAt); + } + + private long getMcUpdateAt() { + return getLong("mc_update_at"); + } + + private void setMcUpdateAt(long mcUpdateAt) { + put("mc_update_at", mcUpdateAt); + } +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalogService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalogService.java new file mode 100644 index 0000000..f10d2cb --- /dev/null +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/catalog/ModelCatalogService.java @@ -0,0 +1,32 @@ +package cc.smtweb.system.bpm.web.design.catalog; + +import cc.smtweb.framework.core.R; +import cc.smtweb.framework.core.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/1 17:00 + * 项目服务类 + */ +@SwService +public class ModelCatalogService extends AbstractCompService { + @Override + protected IHandler createHanlder(String type) { + switch (type) { + case TYPE_LOAD: + return new DefaultLoadHandler(ModelCatalog.ENTITY_NAME); + case TYPE_SAVE: + return new DefaultSaveHandler<>(ModelCatalog.ENTITY_NAME); + case TYPE_DEL: + return new DefaultDelHandler<>(ModelCatalog.ENTITY_NAME); + case TYPE_LIST: + return new DefaultListHandler<>(ModelCatalog.ENTITY_NAME); + case TYPE_COMBO: + return new DefaultListHandler<>(ModelCatalog.ENTITY_NAME); + } + return null; + } +} diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/AbstractCodeService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/AbstractCodeService.java index d47f0ae..4d0057d 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/AbstractCodeService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/codegen/AbstractCodeService.java @@ -3,9 +3,9 @@ package cc.smtweb.system.bpm.web.design.codegen; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.system.bpm.engine.entity.AspModelTreeVO; +import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import cc.smtweb.system.bpm.util.ITreeDataLevelHandler; import cc.smtweb.system.bpm.util.TreeDataUtil; -import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import java.util.List; 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 650fb61..a6b27c9 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 @@ -6,6 +6,8 @@ import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.db.cache.ModelDatabaseCache; import cc.smtweb.framework.core.db.cache.ModelTableCache; +import cc.smtweb.framework.core.db.vo.ModelDatabase; +import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.framework.file.FilePathGenerator; import cc.smtweb.system.bpm.core.exception.ModelLoaderError; @@ -13,8 +15,6 @@ import cc.smtweb.system.bpm.core.ui.entity.BpmPage; import cc.smtweb.system.bpm.core.ui.entity.dataset.BpmDataset; import cc.smtweb.system.bpm.core.ui.entity.form.BpmForm; import cc.smtweb.system.bpm.core.ui.entity.form.BpmWidget; -import cc.smtweb.framework.core.db.vo.ModelDatabase; -import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.system.bpm.engine.entity.AspModelTreeVO; import cc.smtweb.system.bpm.engine.ui.codegen.DefaultVelocityEngine; import cc.smtweb.system.bpm.engine.ui.entity.yaml.YamlDataset; 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 bda2f01..7c5b765 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 @@ -7,13 +7,13 @@ import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.db.cache.ModelDatabaseCache; import cc.smtweb.framework.core.db.cache.ModelTableCache; +import cc.smtweb.framework.core.db.config.DesignConfig; import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.UpdateSqlBuilder; import cc.smtweb.framework.core.db.vo.ModelDatabase; import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.framework.core.util.DateUtil; -import cc.smtweb.framework.core.db.config.DesignConfig; import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import org.apache.commons.lang3.StringUtils; 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 86149b0..02f790e 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 @@ -5,6 +5,7 @@ import cc.smtweb.framework.core.annotation.SwBody; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; +import cc.smtweb.framework.core.db.config.DesignConfig; import cc.smtweb.framework.core.db.sqlbuilder.InsertSqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.SqlBuilder; import cc.smtweb.framework.core.db.sqlbuilder.UpdateSqlBuilder; @@ -19,12 +20,11 @@ import cc.smtweb.system.bpm.engine.ui.loader.IPageRouter; import cc.smtweb.system.bpm.engine.ui.loader.TreePageRouter; import cc.smtweb.system.bpm.engine.ui.loader.UiMobileLoader; import cc.smtweb.system.bpm.engine.ui.loader.UiPcLoader; -import cc.smtweb.framework.core.db.config.DesignConfig; import cc.smtweb.system.bpm.spring.cache.BpmFlowCache; import cc.smtweb.system.bpm.spring.cache.BpmPageCache; +import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import cc.smtweb.system.bpm.util.ITreeDataLevelHandler; import cc.smtweb.system.bpm.util.TreeDataUtil; -import cc.smtweb.system.bpm.spring.dao.DatasetConfigDao; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; 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 21c4161..4470055 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 @@ -4,8 +4,8 @@ import cc.smtweb.framework.core.R; import cc.smtweb.framework.core.SwMap; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; -import cc.smtweb.system.bpm.spring.BpmConfigBean; import cc.smtweb.framework.core.db.config.DesignConfig; +import cc.smtweb.system.bpm.spring.BpmConfigBean; import cc.smtweb.system.bpm.util.YamlUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelExportService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelExportService.java index 3430e8b..c75d93b 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelExportService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/model/AspModelExportService.java @@ -3,8 +3,8 @@ package cc.smtweb.system.bpm.web.design.model; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.framework.core.db.jdbc.IdGenerator; import cc.smtweb.framework.core.db.config.DesignConfig; +import cc.smtweb.framework.core.db.jdbc.IdGenerator; import cc.smtweb.system.bpm.spring.cache.BpmFlowCache; import cc.smtweb.system.bpm.spring.cache.BpmPageCache; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/modelcatalog/AspModelCatalogListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/modelcatalog/AspModelCatalogListService.java index 305077d..1bbbaba 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/modelcatalog/AspModelCatalogListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/modelcatalog/AspModelCatalogListService.java @@ -6,7 +6,6 @@ import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.session.UserSession; import cc.smtweb.system.bpm.engine.entity.AspModelCatalogPO; -import cc.smtweb.system.bpm.web.design.preview.entity.AppVO; import java.util.List; 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 b8fa430..308da55 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 @@ -5,10 +5,7 @@ import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.session.UserSession; -import cc.smtweb.system.bpm.engine.entity.AspModelCatalogPO; -import cc.smtweb.system.bpm.util.TreeDataUtil; import cc.smtweb.system.bpm.web.design.preview.entity.AppVO; -import cc.smtweb.system.bpm.web.design.preview.entity.MenuVO; import java.util.List; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/project/ModelProjectService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/project/ModelProjectService.java index dd58589..3d512c9 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/project/ModelProjectService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/design/project/ModelProjectService.java @@ -1,15 +1,7 @@ package cc.smtweb.system.bpm.web.design.project; -import cc.smtweb.framework.core.R; -import cc.smtweb.framework.core.SwMap; -import cc.smtweb.framework.core.annotation.SwBody; -import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; -import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.framework.core.db.EntityDao; import cc.smtweb.framework.core.mvc.service.*; -import cc.smtweb.framework.core.session.UserSession; -import cc.smtweb.system.bpm.engine.entity.AspModelPO; /** * Created by Akmm at 2022/3/1 17:00 @@ -28,6 +20,8 @@ public class ModelProjectService extends AbstractCompService { return new DefaultDelHandler<>(ModelProject.ENTITY_NAME); case TYPE_LIST: return new DefaultListHandler<>(ModelProject.ENTITY_NAME); + case TYPE_COMBO: + return new DefaultListHandler<>(ModelProject.ENTITY_NAME); } return null; } 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 9835c07..ae9f728 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 @@ -2,7 +2,6 @@ package cc.smtweb.system.bpm.web.task.service; import cc.smtweb.framework.core.SwMap; import cc.smtweb.framework.core.annotation.SwService; -import cc.smtweb.framework.core.db.config.DesignConfig; import cc.smtweb.framework.core.db.vo.ModelField; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.db.vo.def.DataType; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormCardService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormCardService.java index 3019dd8..7f3eac2 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormCardService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormCardService.java @@ -3,7 +3,7 @@ package cc.smtweb.system.bpm.web.ui.dynform; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; import cc.smtweb.system.bpm.core.ui.BpmPageContext; -import cc.smtweb.system.bpm.core.ui.service.card.*; +import cc.smtweb.system.bpm.core.ui.service.card.AbstractDatasetCardService; import cc.smtweb.system.bpm.core.ui.service.card.DatasetCardWorker; import cc.smtweb.system.bpm.spring.dao.DatasetCardDao; import cc.smtweb.system.bpm.web.ui.dao.JsonDatasetCardDao; diff --git a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormListService.java b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormListService.java index c101fe4..ad8a6a2 100644 --- a/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormListService.java +++ b/smtweb-system/sw-system-bpm/src/main/java/cc/smtweb/system/bpm/web/ui/dynform/DynFormListService.java @@ -2,8 +2,9 @@ package cc.smtweb.system.bpm.web.ui.dynform; import cc.smtweb.framework.core.annotation.SwParam; import cc.smtweb.framework.core.annotation.SwService; -import cc.smtweb.system.bpm.core.ui.service.list.*; import cc.smtweb.system.bpm.core.ui.BpmPageContext; +import cc.smtweb.system.bpm.core.ui.service.list.AbstractDatasetListService; +import cc.smtweb.system.bpm.core.ui.service.list.DatasetListWorker; import cc.smtweb.system.bpm.spring.dao.DatasetListDao; import cc.smtweb.system.bpm.web.ui.dao.JsonDatasetListDao; diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm b/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm index 3958dd4..52bc7d2 100644 --- a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm +++ b/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/events.ts.vm @@ -1,5 +1,3 @@ -import { usePageDatasets } from "/@/sw-form"; - export default { create({ pageDataset }) { this.pageDataset = pageDataset; diff --git a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm b/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm index 888f4cf..8d4cf15 100644 --- a/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm +++ b/smtweb-system/sw-system-bpm/src/main/resources/codegen/vm/index.vue.vm @@ -36,11 +36,11 @@