From 0a21443b6f91039fc39be5e11e56bc0e4a708684 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:24:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1208759358029824]工单步骤权限校验优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1208759358029824 --- .../handler/AutoexecOperateHandler.java | 19 ++++++------ .../component/CreateJobProcessComponent.java | 4 +-- .../CreateJobProcessUtilHandler.java | 20 +++++++------ .../component/AutoexecProcessComponent.java | 4 +-- .../AutoexecProcessUtilHandler.java | 30 ++++++++++--------- 5 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java b/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java index 1b66e02a..9a95871a 100644 --- a/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java +++ b/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java @@ -16,7 +16,8 @@ along with this program. If not, see .*/ package neatlogic.module.autoexec.operationauth.handler; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; @@ -36,7 +37,7 @@ import java.util.Map; @Component public class AutoexecOperateHandler extends OperationAuthHandlerBase { - private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @PostConstruct public void init() { @@ -49,10 +50,10 @@ public class AutoexecOperateHandler extends OperationAuthHandlerBase { // .put(operationType, new ProcessTaskAutoexecHandlerNotEnableOperateException(operationType)); // return false; // }); - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_RETREAT, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_RETREAT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_RETREAT; + IOperationType operationType = ProcessTaskStepOperationType.STEP_RETREAT; //1.提示“自动化节点不支持'撤回'操作”； operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskAutoexecHandlerNotEnableOperateException(operationType.getText())); @@ -67,19 +68,19 @@ public class AutoexecOperateHandler extends OperationAuthHandlerBase { // .put(operationType, new ProcessTaskAutoexecHandlerNotEnableOperateException(operationType)); // return false; // }); - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_WORK, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_WORK, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_WORK; + IOperationType operationType = ProcessTaskStepOperationType.STEP_WORK; //1.提示“自动化节点不支持'处理'操作”； operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskAutoexecHandlerNotEnableOperateException(operationType.getText())); return false; }); - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_COMMENT, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_COMMENT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_COMMENT; + IOperationType operationType = ProcessTaskStepOperationType.STEP_COMMENT; //1.提示“自动化节点不支持'回复'操作”； operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskAutoexecHandlerNotEnableOperateException(operationType.getText())); @@ -113,7 +114,7 @@ public class AutoexecOperateHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> getOperationBiPredicateMap() { + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java b/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java index c14c4c7c..7ce3bfa9 100644 --- a/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java @@ -341,10 +341,10 @@ public class CreateJobProcessComponent extends ProcessStepHandlerBase { ProcessTaskStepVo processTaskStepVo = processTaskCrossoverMapper.getProcessTaskStepBaseInfoById(processTaskStepId); JSONObject paramObj = processTaskStepVo.getParamObj(); paramObj.put("nextStepId", nextStepId); - paramObj.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + paramObj.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); /* 自动处理 **/ IProcessStepHandler handler = this; - doNext(ProcessTaskOperationType.STEP_COMPLETE, new ProcessStepThread(processTaskStepVo) { + doNext(ProcessTaskStepOperationType.STEP_COMPLETE, new ProcessStepThread(processTaskStepVo) { @Override public void myExecute() { UserContext.init(SystemUser.SYSTEM); diff --git a/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java b/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java index c598af8c..eca9fd55 100644 --- a/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java @@ -25,7 +25,9 @@ import neatlogic.framework.autoexec.dto.job.AutoexecJobPhaseVo; import neatlogic.framework.autoexec.dto.job.AutoexecJobVo; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.core.INotifyPolicyHandler; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -124,10 +126,10 @@ public class CreateJobProcessUtilHandler extends ProcessStepInternalHandlerBase * 返回步骤动作，校验时用 */ @Override - public ProcessTaskOperationType[] getStepActions() { - return new ProcessTaskOperationType[]{ - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + public IOperationType[] getStepActions() { + return new IOperationType[]{ + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; } @@ -135,12 +137,12 @@ public class CreateJobProcessUtilHandler extends ProcessStepInternalHandlerBase * 返回步骤按钮列表 */ @Override - public ProcessTaskOperationType[] getStepButtons() { - return new ProcessTaskOperationType[]{ - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + public IOperationType[] getStepButtons() { + return new IOperationType[]{ + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; } diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java index 94a24c7b..fe4dab57 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java @@ -1307,7 +1307,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { } JSONObject paramObj = processTaskStepVo.getParamObj(); paramObj.put("nextStepId", nextStepId); - paramObj.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + paramObj.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); if (CollectionUtils.isNotEmpty(formAttributeDataList)) { paramObj.put("formAttributeDataList", formAttributeDataList); } @@ -1315,7 +1315,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { paramObj.put("hidecomponentList", hidecomponentList); } /* 自动处理 **/ - doNext(ProcessTaskOperationType.STEP_COMPLETE, new ProcessStepThread(processTaskStepVo) { + doNext(ProcessTaskStepOperationType.STEP_COMPLETE, new ProcessStepThread(processTaskStepVo) { @Override public void myExecute() { UserContext.init(SystemUser.SYSTEM); diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java index 12707ea5..593674ee 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java @@ -25,7 +25,9 @@ import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.constvalue.AutoexecProcessStepHandlerType; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -128,20 +130,20 @@ public class AutoexecProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONObject resultObj = new JSONObject(); /* 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; JSONArray authorityList = configObj.getJSONArray("authorityList"); JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions); resultObj.put("authorityList", authorityArray); /* 按钮映射 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; JSONArray customButtonList = configObj.getJSONArray("customButtonList"); JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); @@ -164,9 +166,9 @@ public class AutoexecProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONObject resultObj = new JSONObject(); /* 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER }; JSONArray authorityList = null; Integer enableAuthority = configObj.getInteger("enableAuthority"); @@ -195,11 +197,11 @@ public class AutoexecProcessUtilHandler extends ProcessStepInternalHandlerBase { resultObj.put("actionConfig", actionConfigVo); /* 按钮映射列表 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT + ProcessTaskStepOperationType.STEP_ACCEPT }; JSONArray customButtonList = configObj.getJSONArray("customButtonList"); JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); -- Gitee From f2dd84e27cc890055c1ec288e7931c5a5283e4ea Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:49:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E6=AD=A5=E9=AA=A4=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1208759358029824]工单步骤权限校验优化 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1208759358029824 --- .../autoexec/operationauth/handler/AutoexecOperateHandler.java | 2 +- .../stephandler/utilhandler/CreateJobProcessUtilHandler.java | 2 +- .../stephandler/utilhandler/AutoexecProcessUtilHandler.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java b/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java index 9a95871a..7135f636 100644 --- a/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java +++ b/src/main/java/neatlogic/module/autoexec/operationauth/handler/AutoexecOperateHandler.java @@ -16,7 +16,7 @@ along with this program. If not, see .*/ package neatlogic.module.autoexec.operationauth.handler; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; diff --git a/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java b/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java index eca9fd55..452a3be0 100644 --- a/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/autoexec/process/stephandler/utilhandler/CreateJobProcessUtilHandler.java @@ -25,7 +25,7 @@ import neatlogic.framework.autoexec.dto.job.AutoexecJobPhaseVo; import neatlogic.framework.autoexec.dto.job.AutoexecJobVo; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.core.INotifyPolicyHandler; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java index 593674ee..5e3f7a1e 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/utilhandler/AutoexecProcessUtilHandler.java @@ -25,7 +25,7 @@ import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.constvalue.AutoexecProcessStepHandlerType; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskStepDataCrossoverMapper; -- Gitee