diff --git a/src/main/java/neatlogic/module/change/operationauth/handler/ChangeCreateOperationAuthHandler.java b/src/main/java/neatlogic/module/change/operationauth/handler/ChangeCreateOperationAuthHandler.java index 2572fe7378c40f17de8384ac27378e531593eb7e..14427962c66bb0a4886a8d262667f43c1dacc201 100644 --- a/src/main/java/neatlogic/module/change/operationauth/handler/ChangeCreateOperationAuthHandler.java +++ b/src/main/java/neatlogic/module/change/operationauth/handler/ChangeCreateOperationAuthHandler.java @@ -1,6 +1,7 @@ package neatlogic.module.change.operationauth.handler; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.change.constvalue.ChangeProcessStepHandlerType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; @@ -25,7 +26,7 @@ public class ChangeCreateOperationAuthHandler extends OperationAuthHandlerBase { @Override public String getHandler() { - return ChangeOperationAuthHandlerType.CHANGECREATE.getValue(); + return ChangeProcessStepHandlerType.CHANGECREATE.getHandler(); } @Override diff --git a/src/main/java/neatlogic/module/change/operationauth/handler/ChangeHandleOperationAuthHandler.java b/src/main/java/neatlogic/module/change/operationauth/handler/ChangeHandleOperationAuthHandler.java index d21cf9d04ee22640b9bc4a76ddf398c5183f3f82..5217d6e7ebd1622a35ae3683690384e8f3f122e9 100644 --- a/src/main/java/neatlogic/module/change/operationauth/handler/ChangeHandleOperationAuthHandler.java +++ b/src/main/java/neatlogic/module/change/operationauth/handler/ChangeHandleOperationAuthHandler.java @@ -1,6 +1,7 @@ package neatlogic.module.change.operationauth.handler; import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.change.constvalue.ChangeProcessStepHandlerType; import neatlogic.framework.change.constvalue.ChangeStatus; import neatlogic.framework.change.dto.ChangeStepVo; import neatlogic.framework.change.dto.ChangeVo; @@ -13,6 +14,7 @@ import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.operationauth.*; import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerBase; +import neatlogic.framework.process.operationauth.core.PredicateResult; import neatlogic.framework.process.operationauth.core.TernaryPredicate; import neatlogic.module.change.dao.mapper.ChangeMapper; import neatlogic.module.change.operationauth.exception.ProcessTaskChangeStepUndoneException; @@ -46,7 +48,7 @@ public class ChangeHandleOperationAuthHandler extends OperationAuthHandlerBase { if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskHiddenException()); - return false; + return PredicateResult.DENY; } IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); @@ -64,13 +66,13 @@ public class ChangeHandleOperationAuthHandler extends OperationAuthHandlerBase { if (exception != null) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, exception); - return false; + return PredicateResult.DENY; } //8.判断步骤是否未激活,如果isActive=0,则提示“步骤未激活”; if (processTaskStepVo.getIsActive() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskStepNotActiveException()); - return false; + return PredicateResult.DENY; } //8.判断步骤状态是否是“已完成”,如果是,则提示“步骤已完成”; //9.判断步骤状态是否是“异常”,如果是,则提示“步骤异常”; @@ -83,13 +85,13 @@ public class ChangeHandleOperationAuthHandler extends OperationAuthHandlerBase { if (exception != null) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, exception); - return false; + return PredicateResult.DENY; } //12.判断当前步骤是否有下一步骤,如果没有,则提示“该步骤没有下一步骤”; if (!checkNextStepIsExistsByProcessTaskStepIdAndProcessFlowDirection(processTaskVo, processTaskStepVo.getId(), ProcessFlowDirection.FORWARD)) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskStepNotNextStepException()); - return false; + return PredicateResult.DENY; } //13.判断变更步骤列表中是否有“待处理”或“处理中”的步骤,如果有,则提示“有变更步骤未完成”; Long changeId = changeMapper.getChangeIdByProcessTaskStepId(processTaskStepVo.getId()); @@ -102,28 +104,28 @@ public class ChangeHandleOperationAuthHandler extends OperationAuthHandlerBase { || ChangeStatus.RUNNING.getValue().equals(changeStepVo.getStatus())) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskChangeStepUndoneException()); - return false; + return PredicateResult.DENY; } } } } //系统用户默认拥有权限 if (SystemUser.SYSTEM.getUserUuid().equals(userUuid)) { - return true; + return PredicateResult.ACCEPT; } //14.判断当前用户是否是当前步骤的处理人,如果不是,则提示“您不是步骤处理人”; if (!checkIsProcessTaskStepUser(processTaskStepVo, ProcessUserType.MAJOR.getValue(), userUuid)) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) .put(operationType, new ProcessTaskStepNotMajorUserException()); - return false; + return PredicateResult.DENY; } - return true; + return PredicateResult.ACCEPT; }); } @Override public String getHandler() { - return ChangeOperationAuthHandlerType.CHANGEHANDLE.getValue(); + return ChangeProcessStepHandlerType.CHANGEHANDLE.getHandler(); } @Override diff --git a/src/main/java/neatlogic/module/change/operationauth/handler/ChangeOperationAuthHandlerType.java b/src/main/java/neatlogic/module/change/operationauth/handler/ChangeOperationAuthHandlerType.java deleted file mode 100755 index 294cad077d075ebf172bc9f6f964adc70ca2483b..0000000000000000000000000000000000000000 --- a/src/main/java/neatlogic/module/change/operationauth/handler/ChangeOperationAuthHandlerType.java +++ /dev/null @@ -1,24 +0,0 @@ -package neatlogic.module.change.operationauth.handler; - -import neatlogic.framework.process.operationauth.core.IOperationAuthHandlerType; -import neatlogic.framework.util.$; - -public enum ChangeOperationAuthHandlerType implements IOperationAuthHandlerType { - CHANGECREATE("changecreate", "变更创建组件"), - CHANGEHANDLE("changehandle", "变更处理组件"); - - private ChangeOperationAuthHandlerType(String value, String text) { - this.value = value; - this.text = text; - } - private String value; - private String text; - @Override - public String getText() { - return $.t(text); - } - @Override - public String getValue() { - return value; - } -}