From 95b12c79b0d3b1f1d7669c54a2140602bd6da275 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:32:50 +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/EventOperationAuthHandler.java | 22 +++++----- .../utilhandler/EventProcessUtilHandler.java | 44 ++++++++++--------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java b/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java index ab24fdd..a010f5f 100644 --- a/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java +++ b/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java @@ -1,25 +1,23 @@ package neatlogic.module.event.operationauth.handler; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.PostConstruct; - -import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import com.alibaba.fastjson.JSONObject; -import org.springframework.stereotype.Service; - -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; +import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerBase; import neatlogic.framework.process.operationauth.core.TernaryPredicate; +import org.springframework.stereotype.Service; + +import javax.annotation.PostConstruct; +import java.util.HashMap; +import java.util.Map; @Service public class EventOperationAuthHandler extends OperationAuthHandlerBase { - private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @PostConstruct public void init() { @@ -27,7 +25,7 @@ public class EventOperationAuthHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java b/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java index b3c2dea..bf193db 100644 --- a/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java @@ -10,7 +10,9 @@ import neatlogic.framework.event.dto.EventVo; import neatlogic.framework.event.exception.core.EventNotFoundException; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessStepTaskConfigVo; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; @@ -159,23 +161,23 @@ public class EventProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONObject resultObj = new JSONObject(); /** 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER, - ProcessTaskOperationType.STEP_PAUSE, - ProcessTaskOperationType.STEP_RETREAT + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER, + ProcessTaskStepOperationType.STEP_PAUSE, + ProcessTaskStepOperationType.STEP_RETREAT }; JSONArray authorityList = configObj.getJSONArray("authorityList"); JSONArray authorityArray = ProcessConfigUtil.regulateAuthorityList(authorityList, stepActions); resultObj.put("authorityList", authorityArray); /** 按钮映射列表 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, - ProcessTaskOperationType.STEP_COMMENT, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, + ProcessTaskStepOperationType.STEP_COMMENT, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT, + ProcessTaskStepOperationType.STEP_ACCEPT, ProcessTaskOperationType.PROCESSTASK_ABORT, ProcessTaskOperationType.PROCESSTASK_RECOVER }; @@ -206,11 +208,11 @@ public class EventProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONObject resultObj = new JSONObject(); /** 授权 **/ - ProcessTaskOperationType[] stepActions = { - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER, - ProcessTaskOperationType.STEP_PAUSE, - ProcessTaskOperationType.STEP_RETREAT + IOperationType[] stepActions = { + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER, + ProcessTaskStepOperationType.STEP_PAUSE, + ProcessTaskStepOperationType.STEP_RETREAT }; JSONArray authorityList = null; Integer enableAuthority = configObj.getInteger("enableAuthority"); @@ -240,15 +242,15 @@ public class EventProcessUtilHandler extends ProcessStepInternalHandlerBase { JSONArray customButtonList = configObj.getJSONArray("customButtonList"); /** 按钮映射列表 **/ - ProcessTaskOperationType[] stepButtons = { - ProcessTaskOperationType.STEP_COMPLETE, - ProcessTaskOperationType.STEP_BACK, - ProcessTaskOperationType.STEP_COMMENT, + IOperationType[] stepButtons = { + ProcessTaskStepOperationType.STEP_COMPLETE, + ProcessTaskStepOperationType.STEP_BACK, + ProcessTaskStepOperationType.STEP_COMMENT, ProcessTaskOperationType.PROCESSTASK_TRANSFER, - ProcessTaskOperationType.STEP_ACCEPT, + ProcessTaskStepOperationType.STEP_ACCEPT, ProcessTaskOperationType.PROCESSTASK_ABORT, ProcessTaskOperationType.PROCESSTASK_RECOVER, - ProcessTaskOperationType.STEP_REAPPROVAL + ProcessTaskStepOperationType.STEP_REAPPROVAL }; JSONArray customButtonArray = ProcessConfigUtil.regulateCustomButtonList(customButtonList, stepButtons); -- Gitee From 60ef4dba6680f84df7587a9cafb6fa7bea9a0786 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:52:55 +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 --- .../event/operationauth/handler/EventOperationAuthHandler.java | 2 +- .../event/stephandler/utilhandler/EventProcessUtilHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java b/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java index a010f5f..24ea903 100644 --- a/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java +++ b/src/main/java/neatlogic/module/event/operationauth/handler/EventOperationAuthHandler.java @@ -1,7 +1,7 @@ package neatlogic.module.event.operationauth.handler; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; diff --git a/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java b/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java index bf193db..167a1b4 100644 --- a/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/event/stephandler/utilhandler/EventProcessUtilHandler.java @@ -10,7 +10,7 @@ import neatlogic.framework.event.dto.EventVo; import neatlogic.framework.event.exception.core.EventNotFoundException; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; -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.dto.ProcessStepTaskConfigVo; -- Gitee