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 ab24fddd3106b8eb8b197aa3300cb4763a1759de..24ea90386135e936c2ae128fcd5b4206f1eb939a 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.operationauth.core.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 b3c2dea29b1c7e12d074137f0bc101466b48d0b5..167a1b4777fbd315112802a4c091ba82261ec198 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.operationauth.core.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);