From 0103df9754c954fb39683445c1e1991e8475672d Mon Sep 17 00:00:00 2001 From: zhenggm Date: Mon, 5 Sep 2022 09:23:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83AbsDbWorker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/bpm/web/design/flow/ModelProcSaveHandler.java | 4 ++-- .../system/bpm/web/design/form/ModelFormSaveHandler.java | 12 ++++-------- .../system/bpm/web/engine/dynPage/DynPageDelHandler.java | 6 +++--- .../system/bpm/web/engine/dynPage/DynPageSaveHandler.java | 7 +++---- .../cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java | 2 +- .../engine/model/flow/listcard/single/FlowTransHandler.java | 13 +++++++++---- .../web/engine/model/listcard/abshandler/AbsDelHandler.java | 4 ++-- .../engine/model/listcard/abshandler/AbsSaveHandler.java | 4 ++-- .../web/engine/model/listcard/mastersub/LCMsDelHandler.java | 4 ++-- .../engine/model/listcard/mastersub/LCMsSaveHandler.java | 4 ++-- .../engine/model/listcard/single/LCSingleDelHandler.java | 13 ++----------- .../engine/model/listcard/single/LCSingleSaveHandler.java | 4 ++-- .../system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java | 6 +++--- .../cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java | 8 ++++---- .../java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java | 3 ++- .../java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java | 6 +++--- .../framework/core/mvc/service/AbstractDelHandler.java | 6 ++---- .../framework/core/mvc/service/AbstractSaveHandler.java | 4 ++-- .../framework/core/mvc/service/DefaultSaveHandler.java | 7 +++---- 19 files changed, 53 insertions(+), 64 deletions(-) diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcSaveHandler.java index a13c81d..c44bda4 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/flow/ModelProcSaveHandler.java @@ -5,7 +5,7 @@ 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.jdbc.IDbWorker; import cc.smtweb.framework.core.db.vo.ModelField; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.exception.BizException; @@ -65,7 +65,7 @@ public class ModelProcSaveHandler extends DefaultSaveHandler { throw new BizException("没有待保存的数据！"); } bean.setContent(data); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { EntityDao dao = DbEngine.getInstance().findDao(tableName); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java index cf9fae2..4a0cb7f 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormSaveHandler.java @@ -2,23 +2,19 @@ package cc.smtweb.system.bpm.web.design.form; import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.common.SwEnum; -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; -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.ModelTable; import cc.smtweb.framework.core.exception.BizException; import cc.smtweb.framework.core.mvc.service.DefaultSaveHandler; -import cc.smtweb.framework.core.util.CommUtil; -import cc.smtweb.framework.core.util.JsonUtil; import cc.smtweb.system.bpm.web.design.form.model.ModelFactory; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; -import java.util.Set; /** * Created by Akmm at 2022/5/9 17:05 @@ -81,7 +77,7 @@ public class ModelFormSaveHandler extends DefaultSaveHandler { throw new BizException("没有待保存的数据！"); } bean.setDataset(ModelFormHelper.buildSaveDataset(data)); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { EntityDao dao = DbEngine.getInstance().findDao(tableName); @@ -113,7 +109,7 @@ public class ModelFormSaveHandler extends DefaultSaveHandler { throw new BizException("没有待保存的数据！"); } bean.setContent(ModelFormHelper.buildSaveModel(bean, data)); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { EntityDao dao = DbEngine.getInstance().findDao(tableName); @@ -149,7 +145,7 @@ public class ModelFormSaveHandler extends DefaultSaveHandler { //先构建一次，防止有错 String ret = ModelFormHelper.buildReqModel(bean); // ModelFormHelper.buildSaveModelByTmpl(bean, templateId); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { EntityDao dao = DbEngine.getInstance().findDao(tableName); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java index d8b37e1..ba371ae 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageDelHandler.java @@ -9,7 +9,7 @@ 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.jdbc.AbsDbWorker; +import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.exception.BizException; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; @@ -39,7 +39,7 @@ public class DynPageDelHandler extends AbstractDynPageHandler { checkBean(pageDataSet, id); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { ModelTable table = ModelTableCache.getInstance().get(pageDataSet.masterTable); @@ -107,7 +107,7 @@ public class DynPageDelHandler extends AbstractDynPageHandler { info.ids.addAll(list); } } - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { for (RemovableInfo info : mapRemovableInfo.values()) { diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java index 52b5cc1..3fbc9e9 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/dynPage/DynPageSaveHandler.java @@ -9,12 +9,11 @@ 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.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.exception.BizException; -import cc.smtweb.framework.core.mvc.service.DefaultSaveHandler; import cc.smtweb.framework.core.mvc.service.TreeHelper; import cc.smtweb.framework.core.util.StringUtil; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; @@ -55,7 +54,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler { } checkBean(bean); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { saveBean(bean); @@ -108,7 +107,7 @@ public class DynPageSaveHandler extends AbstractDynPageHandler { } checkBean(bean); } - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { for (DefaultEntity bean : map.values()) { diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java index 36f8fdf..80c453b 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/flow/FlowProvider.java @@ -62,7 +62,7 @@ public class FlowProvider extends AbstractCompProvider { public List findBeforeTasks(String taskIds) { EntityDao bdao = DbEngine.getInstance().findDao(Task.class); List list = bdao.queryEx(" t," + EntityHelper.getSchemaTableName(TaskRel.ENTITY_NAME) + " r " + - "where t.task_id=r.trl_src_task_id and r.trl_dst_task_id in (" + taskIds + ")"); + "where t.tsk_id=r.trl_src_task_id and r.trl_dst_task_id in (" + taskIds + ")"); if (CommUtil.isEmpty(list)) return new ArrayList<>(); return list; } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java index 044bfc7..e590922 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/flow/listcard/single/FlowTransHandler.java @@ -2,7 +2,9 @@ package cc.smtweb.system.bpm.web.engine.model.flow.listcard.single; import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.common.SwMap; +import cc.smtweb.framework.core.db.DbEngine; import cc.smtweb.framework.core.db.impl.DefaultEntity; +import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.mvc.service.SwListData; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; import cc.smtweb.system.bpm.web.engine.dynPage.AbstractDynPageHandler; @@ -10,11 +12,8 @@ import cc.smtweb.system.bpm.web.engine.dynPage.DynRetBean; import cc.smtweb.system.bpm.web.engine.flow.FlowHelper; import cc.smtweb.system.bpm.web.engine.flow.FlowInstance; import cc.smtweb.system.bpm.web.engine.flow.FlowListener; -import cc.smtweb.system.bpm.web.engine.flow.entity.Task; import cc.smtweb.system.bpm.web.engine.model.listcard.single.LCSingleHelper; -import java.util.List; - /** * Created by Akmm at 2022-09-01 15:03 * 流程流转 @@ -54,7 +53,13 @@ public class FlowTransHandler extends AbstractDynPageHa public R submit() { load(); - flowInstance.submit(params.readString("comment")); + DbEngine.getInstance().doTrans(new IDbWorker() { + @Override + public void work() { + flowInstance.submit(params.readString("comment")); + } + }); + return R.success(buildRetData()); } diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsDelHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsDelHandler.java index 2db3ca2..7fba375 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsDelHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsDelHandler.java @@ -6,7 +6,7 @@ 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.jdbc.AbsDbWorker; +import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.exception.BizException; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; @@ -31,7 +31,7 @@ public abstract class AbsDelHandler extends AbstractDynPageHandler { // checkBean(pageDataset, id); // - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { ModelTable table = ModelTableCache.getInstance().get(pageDataset.masterTable); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsSaveHandler.java index 943ab8c..0e11d08 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/abshandler/AbsSaveHandler.java @@ -8,7 +8,7 @@ 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.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; @@ -51,7 +51,7 @@ public abstract class AbsSaveHandler extends AbstractD } checkBean(bean); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { saveBean(bean); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsDelHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsDelHandler.java index e971349..8cc78fe 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsDelHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsDelHandler.java @@ -9,7 +9,7 @@ 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.jdbc.AbsDbWorker; +import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.exception.BizException; import cc.smtweb.system.bpm.web.engine.model.listcard.abshandler.AbsDelHandler; @@ -64,7 +64,7 @@ public class LCMsDelHandler extends AbsDelHandler { // List delDetails = subDao.queryWhere(subForeignKey + " = ?", id); checkDetails(delDetails); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { subDao.batchDelete(delDetails); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsSaveHandler.java index d2e33fc..c711a2e 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/mastersub/LCMsSaveHandler.java @@ -6,7 +6,7 @@ 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.jdbc.IDbWorker; import cc.smtweb.framework.core.db.vo.ModelTable; import cc.smtweb.framework.core.exception.BizException; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; @@ -71,7 +71,7 @@ public class LCMsSaveHandler extends AbsSaveHandler { // checkBean(masterBean); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { saveBean(masterBean); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleDelHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleDelHandler.java index 90ab129..9211d7d 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleDelHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleDelHandler.java @@ -3,24 +3,15 @@ package cc.smtweb.system.bpm.web.engine.model.listcard.single; import cc.smtweb.framework.core.cache.AbstractCache; import cc.smtweb.framework.core.cache.CacheManager; import cc.smtweb.framework.core.common.R; -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.EntityHelper; 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.exception.BizException; import cc.smtweb.system.bpm.web.design.form.define.PageDataset; -import cc.smtweb.system.bpm.web.design.form.define.PageDatasetFilter; import cc.smtweb.system.bpm.web.engine.dynPage.AbstractDynPageHandler; -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/4/21 17:53 @@ -40,7 +31,7 @@ public class LCSingleDelHandler extends AbstractDynPageHandler { checkBean(pageDataSet, id); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { ModelTable table = ModelTableCache.getInstance().get(pageDataSet.masterTable); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleSaveHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleSaveHandler.java index 3fd70ad..47e4474 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleSaveHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/engine/model/listcard/single/LCSingleSaveHandler.java @@ -9,7 +9,7 @@ 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.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; @@ -52,7 +52,7 @@ public class LCSingleSaveHandler extends AbstractDynPag } checkBean(bean); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { saveBean(bean); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java index 2de99f4..b3090ec 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/menuPlan/MenuPlanHandler.java @@ -3,7 +3,7 @@ package cc.smtweb.system.bpm.web.sys.user.menuPlan; import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.common.SwMap; import cc.smtweb.framework.core.db.DbEngine; -import cc.smtweb.framework.core.db.jdbc.AbsDbWorker; +import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.exception.BizException; import cc.smtweb.framework.core.mvc.service.AbstractHandler; import cc.smtweb.framework.core.mvc.service.SwListData; @@ -48,7 +48,7 @@ public class MenuPlanHandler { menuPlanContent.saveItem(menuPlanItem, parent_id); menuPlan.setContent(menuPlanContent.toContentStr()); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { DbEngine.getInstance().updateEntity(menuPlan, "smp_content"); @@ -79,7 +79,7 @@ public class MenuPlanHandler { menuPlanContent.delItem(id); menuPlan.setContent(menuPlanContent.toContentStr()); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { DbEngine.getInstance().updateEntity(menuPlan, "smp_content"); diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java index 4ef1885..2d4dab0 100644 --- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java +++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/sys/user/user/UserHandler.java @@ -6,7 +6,7 @@ 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.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.exception.BizException; import cc.smtweb.framework.core.mvc.service.AbstractHandler; @@ -178,7 +178,7 @@ public class UserHandler { public R batchDelParty() { Set idList = params.readLongSet("ids"); Set roleIdList = UserRoleCache.getInstance().getByParty(idList); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { getUserPartyDao().deleteEntity(idList); @@ -198,7 +198,7 @@ public class UserHandler { long id = params.readLong("id"); Set partyIds = UserPartyCache.getInstance().getIdByUser(id); Set roleIds = UserRoleCache.getInstance().getByParty(partyIds); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { getUserDao().deleteEntity(id); @@ -224,7 +224,7 @@ public class UserHandler { userList.forEach(user -> { user.setPwd(LoginHelper.encodePwd(user.getId(), SwConsts.DEF_PWD)); }); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { DbEngine.getInstance().findDao(User.ENTITY_NAME).batchUpdateEntity(userList); diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java index fb87206..f337520 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/AbsDbWorker.java @@ -2,8 +2,9 @@ package cc.smtweb.framework.core.db.jdbc; /** * Created by Akmm at 14-2-15 下午1:51 - * 数据库事务操作方法类 + * 数据库事务操作方法类,被废弃，用IDbWorker替代 */ +@Deprecated public abstract class AbsDbWorker implements IDbWorker { @Override public void doAfterDbCommit() {} diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java index f24c35a..6ccc3ab 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/db/jdbc/IDbWorker.java @@ -5,11 +5,11 @@ package cc.smtweb.framework.core.db.jdbc; * 数据库事务操作方法类 */ public interface IDbWorker { - public void work(); + default void work(){} //数据库提交完后的业务或缓存处理 - public void doAfterDbCommit(); + default void doAfterDbCommit(){} //数据库回滚后的业务或缓存处理 - public void doAfterDbRollback(); + default void doAfterDbRollback(){} } diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java index cdbaaf8..aa99708 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractDelHandler.java @@ -2,7 +2,7 @@ package cc.smtweb.framework.core.mvc.service; 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.db.jdbc.IDbWorker; import lombok.extern.slf4j.Slf4j; /** @@ -17,7 +17,7 @@ public abstract class AbstractDelHandler extends AbstractHandler{ id = readId(); checkValid(); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { delDb(); @@ -25,13 +25,11 @@ public abstract class AbstractDelHandler extends AbstractHandler{ @Override public void doAfterDbCommit() { - super.doAfterDbCommit(); saveSuccess(); } @Override public void doAfterDbRollback() { - super.doAfterDbRollback(); saveFailed(); } }); diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java index 8624ac7..e297ce4 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/AbstractSaveHandler.java @@ -2,7 +2,7 @@ package cc.smtweb.framework.core.mvc.service; 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.db.jdbc.IDbWorker; import lombok.extern.slf4j.Slf4j; /** @@ -29,7 +29,7 @@ public abstract class AbstractSaveHandler extends AbstractHandler { setNewId(); } checkValid(); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work(){ saveDb(); diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java index a1283fa..d9c0db4 100644 --- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java +++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/service/DefaultSaveHandler.java @@ -4,13 +4,12 @@ import cc.smtweb.framework.core.cache.AbstractCache; import cc.smtweb.framework.core.cache.CacheManager; import cc.smtweb.framework.core.common.R; import cc.smtweb.framework.core.common.SwEnum; +import cc.smtweb.framework.core.db.jdbc.IDbWorker; import cc.smtweb.framework.core.exception.BizException; -import cc.smtweb.framework.core.exception.SwException; 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; @@ -46,7 +45,7 @@ public class DefaultSaveHandler extends AbstractHandler readFromPage(); if (bean.getEntityId() <= 0L) bean.setEntityId(DbEngine.getInstance().nextId()); checkValid(); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work(){ saveDb(); @@ -159,7 +158,7 @@ public class DefaultSaveHandler extends AbstractHandler ModelField fieldParentId = table.findFieldByType(SwEnum.FieldType.PARENT_ID.value); bean.put(fieldParentId.getName(), parentId); - DbEngine.getInstance().doTrans(new AbsDbWorker() { + DbEngine.getInstance().doTrans(new IDbWorker() { @Override public void work() { listTreeBean = TreeHelper.getTreeHelper(tableName).resetTreeLevel(bean);