From b6612c2cffb07254f3a75196efa7050293baf48f Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:16:42 +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 --- .../processtask/ProcessTaskAuditListApi.java | 12 +- .../ProcessTaskAutomaticCompleteApi.java | 4 +- .../processtask/ProcessTaskCommentApi.java | 25 ++-- .../ProcessTaskCommentDeleteApi.java | 19 ++- .../ProcessTaskCommentEditApi.java | 17 +-- .../ProcessTaskCurrentUserTaskListApi.java | 17 +-- .../api/processtask/ProcessTaskFormApi.java | 25 ++-- .../ProcessTaskNextStepListApi.java | 29 ++--- .../ProcessTaskStepActionListApi.java | 8 +- .../ProcessTaskStepDraftSaveApi.java | 4 +- .../processtask/ProcessTaskStepGetApi.java | 22 ++-- .../ProcessTaskStepGetBackupApi.java | 28 ++-- .../processtask/ProcessTaskStepListApi.java | 32 +++-- .../ProcessTaskStepStartIfNecessaryApi.java | 19 +-- .../ProcessTaskImportFromJsonApi.java | 10 +- .../task/ProcessTaskStepTaskDeleteApi.java | 14 +- .../task/ProcessTaskStepTaskSaveApi.java | 2 +- ...sTaskStepExecuteSortComparatorTestApi.java | 4 +- .../handler/AutoApprovalHandler.java | 2 +- .../handler/AutoCompleteHandler.java | 6 +- .../handler/ProcessTaskAboutMeCondition.java | 2 +- .../callback/ProcessTaskCallbackHandler.java | 4 +- .../CurrentStepBackContentParamHandler.java | 8 +- ...urrentStepCompleteContentParamHandler.java | 8 +- .../StepTransferContentParamHandler.java | 8 +- .../handler/AutomaticOperateHandler.java | 37 +++--- .../handler/OmnipotentOperateHandler.java | 22 ++-- .../handler/StepOperateHandler.java | 68 +++++----- .../handler/TaskOperateHandler.java | 12 +- .../handler/TimerOperateHandler.java | 23 ++-- .../service/IProcessStepHandlerUtil.java | 8 +- .../service/NewWorkcenterServiceImpl.java | 12 +- .../service/ProcessStepHandlerUtil.java | 122 ++++++++---------- .../ProcessTaskAutomaticServiceImpl.java | 8 +- .../process/service/ProcessTaskService.java | 9 +- .../service/ProcessTaskServiceImpl.java | 84 ++++++------ .../ProcessTaskStepTaskServiceImpl.java | 2 +- .../DistributaryProcessComponent.java | 6 +- .../component/TimerProcessComponent.java | 2 +- .../ProcessTaskStepCostPostProcessor.java | 26 ++-- .../AutomaticProcessUtilHandler.java | 34 +++-- .../OmnipotentProcessUtilHandler.java | 58 ++++----- .../utilhandler/TimerProcessUtilHandler.java | 12 +- .../WorkcenterBuildOperateBuilder.java | 4 +- .../operate/WorkcenterOperateBuilder.java | 7 +- 45 files changed, 435 insertions(+), 450 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java index e99b4f02f..e06eacc18 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java @@ -12,9 +12,9 @@ import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetail import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeFactory; import neatlogic.framework.process.audithandler.core.ProcessTaskStepAuditDetailHandlerFactory; import neatlogic.framework.process.auth.PROCESS_BASE; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepAuditDetailVo; import neatlogic.framework.process.dto.ProcessTaskStepAuditVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -22,6 +22,8 @@ import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.service.ProcessTaskService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -92,10 +94,10 @@ public class ProcessTaskAuditListApi extends PrivateApiComponentBase { Long[] processTaskStepIds = new Long[processTaskStepIdList.size()]; processTaskStepIdList.toArray(processTaskStepIds); builder.addProcessTaskStepId(processTaskStepIds) - .addOperationType(ProcessTaskOperationType.STEP_VIEW); + .addOperationType(ProcessTaskStepOperationType.STEP_VIEW); List processTaskStepList = processTaskMapper.getProcessTaskStepListByIdList(processTaskStepIdList); processTaskStepMap = processTaskStepList.stream().collect(Collectors.toMap(ProcessTaskStepVo::getId, e -> e)); - Map> operateMap = builder.build().getOperateMap(); + Map> operateMap = builder.build().getOperateMap(); if (!operateMap.computeIfAbsent(processTaskId, k -> new HashSet<>()).contains(ProcessTaskOperationType.PROCESSTASK_VIEW)) { return resultList; } @@ -103,7 +105,7 @@ public class ProcessTaskAuditListApi extends PrivateApiComponentBase { for (ProcessTaskStepAuditVo processTaskStepAudit : processTaskStepAuditList) { if (processTaskStepAudit.getProcessTaskStepId() != null) { // 判断当前用户是否有权限查看该节点信息 - if (!operateMap.computeIfAbsent(processTaskStepAudit.getProcessTaskStepId(), k -> new HashSet<>()).contains(ProcessTaskOperationType.STEP_VIEW)) { + if (!operateMap.computeIfAbsent(processTaskStepAudit.getProcessTaskStepId(), k -> new HashSet<>()).contains(ProcessTaskStepOperationType.STEP_VIEW)) { continue; } ProcessTaskStepVo processTaskStepVo = processTaskStepMap.get(processTaskStepAudit.getProcessTaskStepId()); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java index c60647d96..02f241f97 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java @@ -6,7 +6,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; import neatlogic.framework.process.exception.processtask.ProcessTaskAutomaticNotAllowNextStepsException; @@ -69,7 +69,7 @@ public class ProcessTaskAutomaticCompleteApi extends PrivateApiComponentBase { throw new ProcessTaskStepMustBeAutomaticException(); } jsonObj.put("processTaskId", processTaskStepVo.getProcessTaskId()); - if(action.equals(ProcessTaskOperationType.STEP_BACK.getValue())) { + if(action.equals(ProcessTaskStepOperationType.STEP_BACK.getValue())) { flowDirection = ProcessFlowDirection.BACKWARD.getValue(); } /* 不允许多个后续步骤 **/ diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java index c42ceb0c7..3d676656e 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java @@ -1,5 +1,7 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; @@ -9,20 +11,19 @@ import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.crossover.IProcessTaskCommentApiCrossoverService; -import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.process.ProcessCommentTemplateMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -89,7 +90,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); processTaskMapper.getProcessTaskLockById(processTaskId); ProcessTaskStepVo processTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); - new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskOperationType.STEP_COMMENT) + new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskStepOperationType.STEP_COMMENT) .build() .checkAndNoPermissionThrowException(); // 删除暂存 @@ -122,7 +123,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP ProcessTaskStepContentVo processTaskStepContentVo = new ProcessTaskStepContentVo(); processTaskStepContentVo.setProcessTaskId(processTaskId); processTaskStepContentVo.setProcessTaskStepId(processTaskStepId); - processTaskStepContentVo.setType(ProcessTaskOperationType.STEP_COMMENT.getValue()); + processTaskStepContentVo.setType(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); if (StringUtils.isNotBlank(content)) { ProcessTaskContentVo contentVo = new ProcessTaskContentVo(content); processTaskMapper.insertIgnoreProcessTaskContent(contentVo); @@ -166,12 +167,12 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepNotifyTriggerType.COMMENT); JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); - typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); resultObj.put("commentList", processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepId, typeList)); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java index d98bddeb4..7b7f10fbe 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java @@ -1,26 +1,25 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.crossover.IProcessStepHandlerCrossoverUtil; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepReplyVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepCommentNotFoundException; -import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -94,12 +93,12 @@ public class ProcessTaskCommentDeleteApi extends PrivateApiComponentBase { JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); - typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); resultObj.put("commentList", processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(replyVo.getProcessTaskStepId(), typeList)); return resultObj; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java index b20f4ce68..78b5e0d08 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java @@ -1,23 +1,24 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepReplyVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskStepCommentNotFoundException; -import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -95,12 +96,12 @@ public class ProcessTaskCommentEditApi extends PrivateApiComponentBase { JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); - typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); resultObj.put("commentList", processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(oldReplyVo.getProcessTaskStepId(), typeList)); return resultObj; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java index b6ef0b26a..f67bb6118 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java @@ -8,7 +8,8 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.SlaStatus; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.agent.ProcessTaskAgentVo; @@ -95,13 +96,13 @@ public class ProcessTaskCurrentUserTaskListApi extends PrivateApiComponentBase { List currentProcessTaskProcessableStepIdList = new ArrayList<>(); List currentProcessTaskStepList = processTaskMapper.getProcessTaskStepListByProcessTaskId(currentProcessTaskId); List currentProcessTaskStepIdList = currentProcessTaskStepList.stream().map(ProcessTaskStepVo::getId).collect(Collectors.toList()); - Map> operationTypeSetMap = new ProcessAuthManager.Builder().addProcessTaskStepId(currentProcessTaskStepIdList).build().getOperateMap(); - Set processableOperationSet = new HashSet<>(); - processableOperationSet.add(ProcessTaskOperationType.STEP_COMPLETE); - processableOperationSet.add(ProcessTaskOperationType.STEP_RECOVER); - processableOperationSet.add(ProcessTaskOperationType.STEP_ACCEPT); - processableOperationSet.add(ProcessTaskOperationType.STEP_START); - for (Map.Entry> entry : operationTypeSetMap.entrySet()) { + Map> operationTypeSetMap = new ProcessAuthManager.Builder().addProcessTaskStepId(currentProcessTaskStepIdList).build().getOperateMap(); + Set processableOperationSet = new HashSet<>(); + processableOperationSet.add(ProcessTaskStepOperationType.STEP_COMPLETE); + processableOperationSet.add(ProcessTaskStepOperationType.STEP_RECOVER); + processableOperationSet.add(ProcessTaskStepOperationType.STEP_ACCEPT); + processableOperationSet.add(ProcessTaskStepOperationType.STEP_START); + for (Map.Entry> entry : operationTypeSetMap.entrySet()) { if (entry.getValue().removeAll(processableOperationSet)) { currentProcessTaskProcessableStepIdList.add(entry.getKey()); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java index 83fe68bb2..d7d71ca15 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFormApi.java @@ -1,28 +1,23 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; -import neatlogic.framework.process.dto.ProcessTaskStepVo; -import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; -import org.apache.commons.collections4.MapUtils; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +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; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; +import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; -import neatlogic.framework.restful.annotation.Description; -import neatlogic.framework.restful.annotation.Input; -import neatlogic.framework.restful.annotation.OperationType; -import neatlogic.framework.restful.annotation.Output; -import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.module.process.service.ProcessTaskService; +import org.apache.commons.collections4.MapUtils; +import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -84,7 +79,7 @@ public class ProcessTaskFormApi extends PrivateApiComponentBase { processTaskService.setProcessTaskFormInfo(processTaskVo); if (MapUtils.isNotEmpty(processTaskVo.getFormConfig())) { if (processTaskStepId != null) { - if (new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskOperationType.STEP_VIEW).build().check()) { + if (new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskStepOperationType.STEP_VIEW).build().check()) { /** 查出暂存数据中的表单数据 **/ ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setId(processTaskStepId); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java index 50e57ee9e..3c4b70920 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java @@ -1,23 +1,22 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; +import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.AssignableWorkerStepVo; -import neatlogic.framework.process.dto.ProcessTaskVo; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSONObject; - -import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.service.ProcessTaskService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; @@ -60,17 +59,17 @@ public class ProcessTaskNextStepListApi extends PrivateApiComponentBase { Long processTaskId = jsonObj.getLong("processTaskId"); Long processTaskStepId = jsonObj.getLong("processTaskStepId"); ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_COMPLETE; + IOperationType operationType = ProcessTaskStepOperationType.STEP_COMPLETE; String action = jsonObj.getString("action"); - if (ProcessTaskOperationType.STEP_BACK.getValue().equals(action)) { - operationType = ProcessTaskOperationType.STEP_BACK; + if (ProcessTaskStepOperationType.STEP_BACK.getValue().equals(action)) { + operationType = ProcessTaskStepOperationType.STEP_BACK; } new ProcessAuthManager.StepOperationChecker(processTaskStepId, operationType).build() .checkAndNoPermissionThrowException(); Map> assignableWorkerStepMap = processTaskService.getAssignableWorkerStepMap(processTaskVo.getCurrentProcessTaskStep()); List nextStepList = null; - if (operationType == ProcessTaskOperationType.STEP_COMPLETE) { + if (operationType == ProcessTaskStepOperationType.STEP_COMPLETE) { nextStepList = processTaskService.getForwardNextStepListByProcessTaskStepId(processTaskVo.getCurrentProcessTaskStep()); } else { nextStepList = processTaskService.getBackwardNextStepListByProcessTaskStepId(processTaskVo.getCurrentProcessTaskStep()); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java index 5192cd0dc..0586228c6 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.process.auth.PROCESS_BASE; -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.operationauth.core.ProcessAuthManager; @@ -61,10 +61,10 @@ public class ProcessTaskStepActionListApi extends PrivateApiComponentBase { customButtonMap = ProcessStepInternalHandlerFactory.getHandler().getCustomButtonMapByConfigHashAndHandler(processTaskStepVo.getConfigHash(), processTaskStepVo.getHandler()); } List resultList = new ArrayList<>(); - Map> operationTypeSetMap = new ProcessAuthManager.Builder() + Map> operationTypeSetMap = new ProcessAuthManager.Builder() .addProcessTaskId(processTaskId).addProcessTaskStepId(processTaskStepId).build().getOperateMap(); - for (Map.Entry> entry : operationTypeSetMap.entrySet()) { - for (ProcessTaskOperationType operationType : entry.getValue()) { + for (Map.Entry> entry : operationTypeSetMap.entrySet()) { + for (IOperationType operationType : entry.getValue()) { String text = customButtonMap.get(operationType.getValue()); if (StringUtils.isBlank(text)) { text = operationType.getText(); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java index 02e3601c6..73d622508 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDraftSaveApi.java @@ -5,8 +5,8 @@ import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepDataType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -79,7 +79,7 @@ public class ProcessTaskStepDraftSaveApi extends PrivateApiComponentBase { if (handler == null) { throw new ProcessStepUtilHandlerNotFoundException(processTaskStepVo.getHandler()); } - new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskOperationType.STEP_SAVE) + new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskStepOperationType.STEP_SAVE) .build() .checkAndNoPermissionThrowException(); ProcessTaskStepDataVo processTaskStepDataVo = new ProcessTaskStepDataVo(); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java index 4bdc59860..aff82e576 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java @@ -8,8 +8,10 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.config.ConfigManager; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ItsmTenantConfig; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; @@ -81,14 +83,14 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase { .addOperationType(ProcessTaskOperationType.PROCESSTASK_SCORE); if (processTaskStepId != null) { builder.addProcessTaskStepId(processTaskStepId) - .addOperationType(ProcessTaskOperationType.STEP_VIEW) - .addOperationType(ProcessTaskOperationType.STEP_SAVE) - .addOperationType(ProcessTaskOperationType.STEP_COMPLETE); + .addOperationType(ProcessTaskStepOperationType.STEP_VIEW) + .addOperationType(ProcessTaskStepOperationType.STEP_SAVE) + .addOperationType(ProcessTaskStepOperationType.STEP_COMPLETE); } ProcessAuthManager processAuthManager = builder.build(); - Map> operationTypeSetMap = processAuthManager.getOperateMap(); + Map> operationTypeSetMap = processAuthManager.getOperateMap(); - Set taskOperationTypeSet = operationTypeSetMap.get(processTaskId); + Set taskOperationTypeSet = operationTypeSetMap.get(processTaskId); if (!taskOperationTypeSet.contains(ProcessTaskOperationType.PROCESSTASK_VIEW)) { ProcessTaskPermissionDeniedException exception = processAuthManager.getProcessTaskPermissionDeniedException(processTaskId, ProcessTaskOperationType.PROCESSTASK_VIEW); if (exception != null) { @@ -157,14 +159,14 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase { ProcessTaskStepVo currentProcessTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); if (currentProcessTaskStepVo != null) { - Set stepOperationTypeSet = operationTypeSetMap.get(processTaskStepId); - if (stepOperationTypeSet.contains(ProcessTaskOperationType.STEP_VIEW)) { + Set stepOperationTypeSet = operationTypeSetMap.get(processTaskStepId); + if (stepOperationTypeSet.contains(ProcessTaskStepOperationType.STEP_VIEW)) { phaser.register(); NeatLogicThread currentProcessTaskStepDetailThread = new NeatLogicThread("CURRENT_PROCESSTASKSTEP_DETAIL_" + processTaskStepId, true) { @Override protected void execute() { try { - processTaskService.getCurrentProcessTaskStepDetail(currentProcessTaskStepVo, stepOperationTypeSet.contains(ProcessTaskOperationType.STEP_COMPLETE)); + processTaskService.getCurrentProcessTaskStepDetail(currentProcessTaskStepVo, stepOperationTypeSet.contains(ProcessTaskStepOperationType.STEP_COMPLETE)); } finally { phaser.arrive(); } @@ -200,8 +202,8 @@ public class ProcessTaskStepGetApi extends PrivateApiComponentBase { processTaskVo.setMobileFormUIType(Integer.valueOf(ProcessConfig.MOBILE_FORM_UI_TYPE())); phaser.awaitAdvance(0); if (currentProcessTaskStepVo != null) { - Set stepOperationTypeSet = operationTypeSetMap.get(processTaskStepId); - if (stepOperationTypeSet.contains(ProcessTaskOperationType.STEP_SAVE)) { + Set stepOperationTypeSet = operationTypeSetMap.get(processTaskStepId); + if (stepOperationTypeSet.contains(ProcessTaskStepOperationType.STEP_SAVE)) { // 回复框内容和附件暂存回显 processTaskService.setTemporaryData(processTaskVo, currentProcessTaskStepVo); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java index e03200515..adaedde79 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java @@ -1,13 +1,13 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; +import neatlogic.framework.process.constvalue.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ChannelVo; import neatlogic.framework.process.dto.ProcessTaskScoreTemplateVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -19,8 +19,10 @@ import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.common.config.ProcessConfig; +import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.score.ScoreTemplateMapper; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -77,13 +79,13 @@ public class ProcessTaskStepGetBackupApi extends PrivateApiComponentBase { .addOperationType(ProcessTaskOperationType.PROCESSTASK_SCORE); if (processTaskStepId != null) { builder.addProcessTaskStepId(processTaskStepId) - .addOperationType(ProcessTaskOperationType.STEP_VIEW) - .addOperationType(ProcessTaskOperationType.STEP_SAVE) - .addOperationType(ProcessTaskOperationType.STEP_COMPLETE); + .addOperationType(ProcessTaskStepOperationType.STEP_VIEW) + .addOperationType(ProcessTaskStepOperationType.STEP_SAVE) + .addOperationType(ProcessTaskStepOperationType.STEP_COMPLETE); } - Map> operationTypeSetMap = builder.build().getOperateMap(); + Map> operationTypeSetMap = builder.build().getOperateMap(); - Set taskOperationTypeSet = operationTypeSetMap.get(processTaskId); + Set taskOperationTypeSet = operationTypeSetMap.get(processTaskId); // if (!new ProcessAuthManager.TaskOperationChecker(processTaskId, ProcessTaskOperationType.PROCESSTASK_VIEW).build().check()) { if (!taskOperationTypeSet.contains(ProcessTaskOperationType.PROCESSTASK_VIEW)) { if (ProcessTaskStatus.DRAFT.getValue().equals(processTaskVo.getStatus())) { @@ -123,11 +125,11 @@ public class ProcessTaskStepGetBackupApi extends PrivateApiComponentBase { processTaskVo.setStartProcessTaskStep(processTaskService.getStartProcessTaskStepByProcessTaskId(processTaskId)); ProcessTaskStepVo currentProcessTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); if (currentProcessTaskStepVo != null) { - Set stepOperationTypeSet = operationTypeSetMap.get(processTaskStepId); - if (stepOperationTypeSet.contains(ProcessTaskOperationType.STEP_VIEW)) { - processTaskService.getCurrentProcessTaskStepDetail(currentProcessTaskStepVo, stepOperationTypeSet.contains(ProcessTaskOperationType.STEP_COMPLETE)); + Set stepOperationTypeSet = operationTypeSetMap.get(processTaskStepId); + if (stepOperationTypeSet.contains(ProcessTaskStepOperationType.STEP_VIEW)) { + processTaskService.getCurrentProcessTaskStepDetail(currentProcessTaskStepVo, stepOperationTypeSet.contains(ProcessTaskStepOperationType.STEP_COMPLETE)); // if (new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskOperationType.STEP_SAVE).build().check()) { - if (stepOperationTypeSet.contains(ProcessTaskOperationType.STEP_SAVE)) { + if (stepOperationTypeSet.contains(ProcessTaskStepOperationType.STEP_SAVE)) { // 回复框内容和附件暂存回显 processTaskService.setTemporaryData(processTaskVo, currentProcessTaskStepVo); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index 0377d4b34..0e4ce5ca7 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -7,9 +7,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessStepType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; +import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; @@ -94,9 +92,9 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { // 其他处理步骤 if (CollectionUtils.isNotEmpty(resultList)) { List processTaskStepIdList = resultList.stream().map(ProcessTaskStepVo::getId).collect(Collectors.toList()); - Map> operateMap = new ProcessAuthManager.Builder() + Map> operateMap = new ProcessAuthManager.Builder() .addProcessTaskStepId(processTaskStepIdList) - .addOperationType(ProcessTaskOperationType.STEP_VIEW) + .addOperationType(ProcessTaskStepOperationType.STEP_VIEW) .build() .getOperateMap(); for (ProcessTaskStepVo processTaskStepVo : resultList) { @@ -105,8 +103,8 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { if (handler == null) { throw new ProcessStepUtilHandlerNotFoundException(processTaskStepVo.getHandler()); } - Set processTaskStepOperateSet = operateMap.get(processTaskStepVo.getId()); - if (CollectionUtils.isNotEmpty(processTaskStepOperateSet) && processTaskStepOperateSet.contains(ProcessTaskOperationType.STEP_VIEW)) { + Set processTaskStepOperateSet = operateMap.get(processTaskStepVo.getId()); + if (CollectionUtils.isNotEmpty(processTaskStepOperateSet) && processTaskStepOperateSet.contains(ProcessTaskStepOperationType.STEP_VIEW)) { processTaskStepVo.setIsView(1); if (!Objects.equals(processTaskStepVo.getId(), startProcessTaskStepVo.getId())) { getProcessTaskStepDetail(processTaskStepVo); @@ -138,14 +136,14 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { startProcessTaskStepVo.setSlaTimeList(processTaskService.getSlaTimeListByProcessTaskStepId(startProcessTaskStepVo.getId())); // 步骤评论列表 List typeList = new ArrayList<>(); - typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); - typeList.add(ProcessTaskOperationType.STEP_TRANSFER.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_TRANSFER.getValue()); startProcessTaskStepVo.setCommentList( processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(startProcessTaskStepVo.getId(), typeList)); //任务列表 @@ -167,14 +165,14 @@ public class ProcessTaskStepListApi extends PrivateApiComponentBase { processTaskStepVo.setHandlerStepInfo(processStepUtilHandler.getNonStartStepInfo(processTaskStepVo)); // 步骤评论列表 List typeList = new ArrayList<>(); - typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); - typeList.add(ProcessTaskOperationType.STEP_TRANSFER.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_TRANSFER.getValue()); processTaskStepVo.setCommentList( processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepVo.getId(), typeList)); processTaskStepVo.setActionList(processTaskService.getProcessTaskActionListByProcessTaskStepId(processTaskStepVo.getId())); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java index 26b42df34..aa2478e86 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java @@ -5,7 +5,8 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; @@ -54,21 +55,21 @@ public class ProcessTaskStepStartIfNecessaryApi extends PrivateApiComponentBase public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); Long processTaskStepId = jsonObj.getLong("processTaskStepId"); - Map> operationTypeSetMap = new ProcessAuthManager.Builder() + Map> operationTypeSetMap = new ProcessAuthManager.Builder() .addProcessTaskId(processTaskId) .addProcessTaskStepId(processTaskStepId) - .addOperationType(ProcessTaskOperationType.STEP_START) - .addOperationType(ProcessTaskOperationType.STEP_ACCEPT) + .addOperationType(ProcessTaskStepOperationType.STEP_START) + .addOperationType(ProcessTaskStepOperationType.STEP_ACCEPT) .build() .getOperateMap(); - Set processTaskOperationTypeList = operationTypeSetMap.get(processTaskStepId); + Set processTaskOperationTypeList = operationTypeSetMap.get(processTaskStepId); if (CollectionUtils.isNotEmpty(processTaskOperationTypeList)) { - if (processTaskOperationTypeList.contains(ProcessTaskOperationType.STEP_ACCEPT)) { - jsonObj.put("action", ProcessTaskOperationType.STEP_ACCEPT.getValue()); + if (processTaskOperationTypeList.contains(ProcessTaskStepOperationType.STEP_ACCEPT)) { + jsonObj.put("action", ProcessTaskStepOperationType.STEP_ACCEPT.getValue()); System.out.println("jsonObj = " + jsonObj); processTaskService.startProcessTaskStep(jsonObj); - } else if (processTaskOperationTypeList.contains(ProcessTaskOperationType.STEP_START)) { - jsonObj.put("action", ProcessTaskOperationType.STEP_START.getValue()); + } else if (processTaskOperationTypeList.contains(ProcessTaskStepOperationType.STEP_START)) { + jsonObj.put("action", ProcessTaskStepOperationType.STEP_START.getValue()); System.out.println("jsonObj = " + jsonObj); processTaskService.startProcessTaskStep(jsonObj); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java b/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java index c12199a56..e9b056ace 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/datamigration/ProcessTaskImportFromJsonApi.java @@ -1,5 +1,7 @@ package neatlogic.module.process.api.processtask.datamigration; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.JSONReader; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.file.dao.mapper.FileMapper; @@ -7,7 +9,7 @@ import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.constvalue.ProcessStepType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberPolicyHandlerNotFoundException; import neatlogic.framework.process.exception.processtaskserialnumberpolicy.ProcessTaskSerialNumberPolicyNotFoundException; @@ -19,11 +21,9 @@ import neatlogic.framework.restful.core.privateapi.PrivateJsonStreamApiComponent import neatlogic.framework.util.TimeUtil; import neatlogic.framework.worktime.dao.mapper.WorktimeMapper; import neatlogic.framework.worktime.dto.WorktimeVo; -import neatlogic.module.process.dao.mapper.process.ProcessMapper; -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.JSONReader; import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.module.process.dao.mapper.catalog.PriorityMapper; +import neatlogic.module.process.dao.mapper.process.ProcessMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskSerialNumberMapper; import org.apache.commons.collections4.CollectionUtils; @@ -329,7 +329,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB } processTaskStepContentVo.setProcessTaskId(processTask.getId()); processTaskStepContentVo.setProcessTaskStepId(processTaskStep.getId()); - processTaskStepContentVo.setType(ProcessTaskOperationType.STEP_COMMENT.getValue()); + processTaskStepContentVo.setType(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); if (StringUtils.isNotBlank(source)) { processTaskStepContentVo.setSource(source); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java index f26f2cdc2..e86b5edcd 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskDeleteApi.java @@ -15,13 +15,12 @@ along with this program. If not, see .*/ package neatlogic.module.process.api.processtask.task; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessTaskAuditType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepTaskUserVo; import neatlogic.framework.process.dto.ProcessTaskStepTaskVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; @@ -32,12 +31,13 @@ import neatlogic.framework.process.notify.constvalue.ProcessTaskStepTaskNotifyTr import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; -import neatlogic.module.process.service.ProcessTaskService; -import neatlogic.module.process.service.IProcessStepHandlerUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; -import com.alibaba.fastjson.JSONObject; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; +import neatlogic.module.process.service.IProcessStepHandlerUtil; +import neatlogic.module.process.service.ProcessTaskService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -96,7 +96,7 @@ public class ProcessTaskStepTaskDeleteApi extends PrivateApiComponentBase { throw new ProcessTaskStepNotFoundException(stepTaskVo.getProcessTaskStepId().toString()); } //校验执行权限 - new ProcessAuthManager.StepOperationChecker(processTaskStepVo.getId(), ProcessTaskOperationType.TASK_DELETE) + new ProcessAuthManager.StepOperationChecker(processTaskStepVo.getId(), ProcessTaskStepOperationType.TASK_DELETE) .build() .checkAndNoPermissionThrowException(); // 锁定当前流程 diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java index cda5fd3c0..824568dcb 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskSaveApi.java @@ -167,7 +167,7 @@ public class ProcessTaskStepTaskSaveApi extends PrivateApiComponentBase { } //第二步 校验执行权限 - new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskOperationType.TASK_CREATE) + new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskStepOperationType.TASK_CREATE) .build() .checkAndNoPermissionThrowException(); diff --git a/src/main/java/neatlogic/module/process/api/processtask/test/ProcessTaskStepExecuteSortComparatorTestApi.java b/src/main/java/neatlogic/module/process/api/processtask/test/ProcessTaskStepExecuteSortComparatorTestApi.java index d265c0f89..e44965809 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/test/ProcessTaskStepExecuteSortComparatorTestApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/test/ProcessTaskStepExecuteSortComparatorTestApi.java @@ -22,7 +22,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.constvalue.ProcessStepMode; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepRelVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.stephandler.core.ProcessTaskStepThread; @@ -75,7 +75,7 @@ public class ProcessTaskStepExecuteSortComparatorTestApi extends PrivateApiCompo List processTaskStepThreadList = new ArrayList<>(); for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { - ProcessTaskStepThread thread = new ProcessTaskStepThread(ProcessTaskOperationType.STEP_ACTIVE, processTaskStepVo, ProcessStepMode.MT) { + ProcessTaskStepThread thread = new ProcessTaskStepThread(ProcessTaskStepOperationType.STEP_ACTIVE, processTaskStepVo, ProcessStepMode.MT) { @Override protected void myExecute(ProcessTaskStepVo processTaskStepVo) { diff --git a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java index e0c090cad..df3a58fd7 100644 --- a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java +++ b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoApprovalHandler.java @@ -131,7 +131,7 @@ public class AutoApprovalHandler implements IAutoCompleteRuleHandler { ProcessTaskStepInOperationVo processTaskStepInOperationVo = new ProcessTaskStepInOperationVo( currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), - ProcessTaskOperationType.STEP_COMPLETE.getValue() + ProcessTaskStepOperationType.STEP_COMPLETE.getValue() ); IProcessStepInternalHandler processStepInternalHandler = ProcessStepInternalHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); if (processStepInternalHandler == null) { diff --git a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java index c37868032..c76b2966f 100644 --- a/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java +++ b/src/main/java/neatlogic/module/process/autocompleterule/handler/AutoCompleteHandler.java @@ -23,16 +23,16 @@ import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.dto.UserVo; import neatlogic.framework.process.autocompleterule.core.IAutoCompleteRuleHandler; import neatlogic.framework.process.constvalue.ProcessFlowDirection; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; import neatlogic.framework.process.constvalue.ProcessUserType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskStepInOperationVo; import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; import neatlogic.framework.process.stephandler.core.*; import neatlogic.framework.service.AuthenticationInfoService; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.springframework.stereotype.Component; import javax.annotation.Resource; @@ -96,7 +96,7 @@ public class AutoCompleteHandler implements IAutoCompleteRuleHandler { ProcessTaskStepInOperationVo processTaskStepInOperationVo = new ProcessTaskStepInOperationVo( currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), - ProcessTaskOperationType.STEP_COMPLETE.getValue() + ProcessTaskStepOperationType.STEP_COMPLETE.getValue() ); IProcessStepInternalHandler processStepInternalHandler = ProcessStepInternalHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); if (processStepInternalHandler == null) { diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskAboutMeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskAboutMeCondition.java index ca7201865..e985e0d47 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskAboutMeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskAboutMeCondition.java @@ -87,7 +87,7 @@ public class ProcessTaskAboutMeCondition extends ProcessTaskConditionBase implem mapSql.put("transferredOfMine", (sqlSb) -> { sqlSb.append(" ( "); - sqlSb.append(Expression.getExpressionSql(Expression.EQUAL.getExpression(), new ProcessTaskStepAuditSqlTable().getShortName(), ProcessTaskStepCostSqlTable.FieldEnum.START_OPERATE.getValue(), ProcessTaskOperationType.STEP_TRANSFER.getValue())); + sqlSb.append(Expression.getExpressionSql(Expression.EQUAL.getExpression(), new ProcessTaskStepAuditSqlTable().getShortName(), ProcessTaskStepCostSqlTable.FieldEnum.START_OPERATE.getValue(), ProcessTaskStepOperationType.STEP_TRANSFER.getValue())); sqlSb.append(" and "); sqlSb.append(Expression.getExpressionSql(Expression.EQUAL.getExpression(), new ProcessTaskStepAuditSqlTable().getShortName(), ProcessTaskStepCostSqlTable.FieldEnum.START_USER_UUID.getValue(), UserContext.get().getUserUuid(true))); sqlSb.append(" ) "); diff --git a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java index c9b199645..8d25bc069 100644 --- a/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java +++ b/src/main/java/neatlogic/module/process/job/callback/ProcessTaskCallbackHandler.java @@ -26,7 +26,7 @@ import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.process.constvalue.AutoExecJobProcessSource; import neatlogic.framework.process.constvalue.AutoexecProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessFlowDirection; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.automatic.FailPolicy; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskException; @@ -149,7 +149,7 @@ public class ProcessTaskCallbackHandler extends AutoexecJobCallbackBase { try { JSONObject paramObj = processTaskStepVo.getParamObj(); paramObj.put("nextStepId", nextStepId); - paramObj.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + paramObj.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); UserContext.init(SystemUser.SYSTEM); handler.autoComplete(processTaskStepVo); } catch (ProcessTaskNoPermissionException e) { diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java index 4a51dcad1..ea2f199a1 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepBackContentParamHandler.java @@ -16,14 +16,14 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -54,7 +54,7 @@ public class CurrentStepBackContentParamHandler extends ProcessTaskNotifyParamHa List processTaskStepContentList = processTaskMapper.getProcessTaskStepContentByProcessTaskStepId(processTaskStepVo.getId()); // 遍历列表，找出最近一次处理内容 for (ProcessTaskStepContentVo contentVo : processTaskStepContentList) { - if (Objects.equals(contentVo.getType(), ProcessTaskOperationType.STEP_BACK.getValue())) { + if (Objects.equals(contentVo.getType(), ProcessTaskStepOperationType.STEP_BACK.getValue())) { String contentHash = contentVo.getContentHash(); if (StringUtils.isBlank(contentHash)) { return null; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java index f5442cefb..ddb418f59 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/CurrentStepCompleteContentParamHandler.java @@ -16,14 +16,14 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -54,7 +54,7 @@ public class CurrentStepCompleteContentParamHandler extends ProcessTaskNotifyPar List processTaskStepContentList = processTaskMapper.getProcessTaskStepContentByProcessTaskStepId(processTaskStepVo.getId()); // 遍历列表，找出最近一次处理内容 for (ProcessTaskStepContentVo contentVo : processTaskStepContentList) { - if (Objects.equals(contentVo.getType(), ProcessTaskOperationType.STEP_COMPLETE.getValue())) { + if (Objects.equals(contentVo.getType(), ProcessTaskStepOperationType.STEP_COMPLETE.getValue())) { String contentHash = contentVo.getContentHash(); if (StringUtils.isBlank(contentHash)) { return null; diff --git a/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java b/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java index d4c2535ba..a11df903a 100644 --- a/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java +++ b/src/main/java/neatlogic/module/process/notify/handler/param/StepTransferContentParamHandler.java @@ -16,14 +16,14 @@ along with this program. If not, see .*/ package neatlogic.module.process.notify.handler.param; import neatlogic.framework.notify.core.INotifyTriggerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepContentVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyParam; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; import neatlogic.framework.process.notify.core.ProcessTaskNotifyParamHandlerBase; +import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -54,7 +54,7 @@ public class StepTransferContentParamHandler extends ProcessTaskNotifyParamHandl List processTaskStepContentList = processTaskMapper.getProcessTaskStepContentByProcessTaskStepId(processTaskStepVo.getId()); // 遍历列表，找出最近一次转交内容 for (ProcessTaskStepContentVo contentVo : processTaskStepContentList) { - if (Objects.equals(contentVo.getType(), ProcessTaskOperationType.STEP_TRANSFER.getValue())) { + if (Objects.equals(contentVo.getType(), ProcessTaskStepOperationType.STEP_TRANSFER.getValue())) { String contentHash = contentVo.getContentHash(); if (StringUtils.isBlank(contentHash)) { return null; diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java index 0f6b5d6c9..5c8ccf7b6 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java @@ -1,52 +1,51 @@ package neatlogic.module.process.operationauth.handler; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.PostConstruct; - -import neatlogic.framework.process.exception.operationauth.ProcessTaskAutomaticHandlerNotEnableOperateException; -import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import com.alibaba.fastjson.JSONObject; -import org.springframework.stereotype.Component; - -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.ProcessTaskAutomaticHandlerNotEnableOperateException; +import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerBase; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerType; import neatlogic.framework.process.operationauth.core.TernaryPredicate; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.HashMap; +import java.util.Map; @Component public class AutomaticOperateHandler extends OperationAuthHandlerBase { - private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @PostConstruct public void init() { - 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 ProcessTaskAutomaticHandlerNotEnableOperateException(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 ProcessTaskAutomaticHandlerNotEnableOperateException(operationType)); 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 ProcessTaskAutomaticHandlerNotEnableOperateException(operationType)); @@ -60,7 +59,7 @@ public class AutomaticOperateHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java index bd99f973a..fa49a1cc3 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java @@ -1,26 +1,24 @@ package neatlogic.module.process.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.Component; - -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.OperationAuthHandlerType; import neatlogic.framework.process.operationauth.core.TernaryPredicate; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; +import java.util.HashMap; +import java.util.Map; @Component public class OmnipotentOperateHandler extends OperationAuthHandlerBase { - private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @PostConstruct public void init() { @@ -33,7 +31,7 @@ public class OmnipotentOperateHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java index 83905f117..84d9e17a2 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java @@ -30,8 +30,8 @@ import java.util.Objects; @Component public class StepOperateHandler extends OperationAuthHandlerBase { - private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @Resource private UserMapper userMapper; @@ -50,9 +50,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 3.userUuid用户是步骤的处理人或协助处理人 * 4.userUuid用户在步骤权限设置中获得“查看节点信息”的授权 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_VIEW, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_VIEW, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_VIEW; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_VIEW; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { //判断当前用户是否有“工单管理权限”或者是系统用户，如果两者都没有，则提示“工单已隐藏”； @@ -101,10 +101,10 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤转交权限逻辑： * 首先步骤状态是“已激活”，然后userUuid用户在步骤权限设置中获得“转交”的授权 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_TRANSFER, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_TRANSFER, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_TRANSFER; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_TRANSFER; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -165,9 +165,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤接受权限逻辑： * 首先步骤状态是“已激活”且“待处理”，然后userUuid用户是步骤的待处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_ACCEPT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_ACCEPT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_ACCEPT; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_ACCEPT; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -257,9 +257,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤开始权限逻辑： * 首先步骤状态是“已激活”且“待处理”，然后userUuid用户是步骤的处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_START, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_START, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_START; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_START; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -321,9 +321,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤流转权限逻辑： * 首先步骤状态是“处理中”，然后userUuid用户是步骤的处理人，且步骤有前进（实线）方向的连线 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_COMPLETE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_COMPLETE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_COMPLETE; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_COMPLETE; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -388,9 +388,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤回退权限逻辑： * 首先步骤状态是“处理中”，然后userUuid用户是步骤的处理人，且步骤有回退（虚线）方向的连线 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_BACK, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_BACK, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_BACK; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_BACK; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -457,9 +457,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤暂存权限逻辑： * 首先步骤状态是“处理中”，然后userUuid用户是步骤的处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_SAVE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_SAVE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_SAVE; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_SAVE; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -520,13 +520,13 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤回复权限逻辑： * 首先步骤状态是“处理中”，然后userUuid用户是步骤的处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_COMMENT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_COMMENT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { String processTaskStepEnableComment = ConfigManager.getConfig(ItsmTenantConfig.PROCESS_TASK_STEP_ENABLE_COMMENT); if (!Objects.equals(processTaskStepEnableComment, "1")) { return false; } Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_COMMENT; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_COMMENT; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -587,9 +587,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤暂停权限逻辑： * 首先步骤状态是“处理中”，然后userUuid用户在步骤权限设置中获得“暂停”的授权 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_PAUSE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_PAUSE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_PAUSE; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_PAUSE; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -650,9 +650,9 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤恢复权限逻辑： * 首先步骤状态是“已激活”且“已挂起”，然后userUuid用户在步骤权限设置中获得“暂停”的授权 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_RECOVER, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_RECOVER, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_RECOVER; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_RECOVER; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -699,7 +699,7 @@ public class StepOperateHandler extends OperationAuthHandlerBase { return true; } //13.判断当前用户是否有当前步骤“暂停”操作权限，如果没有，则提示“您的'恢复'操作未获得授权”； - if (checkOperationAuthIsConfigured(processTaskVo, processTaskStepVo, ProcessTaskOperationType.STEP_PAUSE, userUuid)) { + if (checkOperationAuthIsConfigured(processTaskVo, processTaskStepVo, ProcessTaskStepOperationType.STEP_PAUSE, userUuid)) { return true; } operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -711,10 +711,10 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤撤回权限逻辑： * 首先工单状态是“处理中”，步骤状态是“已完成”，然后userUuid用户在步骤权限设置中获得“撤回”的授权，当前步骤流转时激活步骤列表中有未完成的步骤 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_RETREAT, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_RETREAT, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_RETREAT; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_RETREAT; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -769,10 +769,10 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤撤回权限逻辑： * 首先工单状态是“处理中”，步骤状态是“处理中”，然后userUuid用户是步骤处理人，当前步骤是由回退线操作激活的 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_REAPPROVAL, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_REAPPROVAL, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_REAPPROVAL; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_REAPPROVAL; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -856,10 +856,10 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤处理权限逻辑： * 首先步骤状态是“已激活”，然后userUuid用户是步骤的处理人或待处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.STEP_WORK, + operationBiPredicateMap.put(ProcessTaskStepOperationType.STEP_WORK, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.STEP_WORK; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.STEP_WORK; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -919,10 +919,10 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤创建任务权限逻辑： * 首先步骤状态是“处理中”，然后userUuid用户是步骤的处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.TASK_CREATE, + operationBiPredicateMap.put(ProcessTaskStepOperationType.TASK_CREATE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.TASK_CREATE; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.TASK_CREATE; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -984,10 +984,10 @@ public class StepOperateHandler extends OperationAuthHandlerBase { * 判断userUuid用户是否有步骤删除任务权限逻辑： * userUuid用户是步骤的处理人 */ - operationBiPredicateMap.put(ProcessTaskOperationType.TASK_DELETE, + operationBiPredicateMap.put(ProcessTaskStepOperationType.TASK_DELETE, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.TASK_DELETE; + ProcessTaskStepOperationType operationType = ProcessTaskStepOperationType.TASK_DELETE; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -1049,7 +1049,7 @@ public class StepOperateHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java index 168a684c2..b8808381c 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java @@ -29,8 +29,8 @@ import java.util.*; @Component public class TaskOperateHandler extends OperationAuthHandlerBase { - private Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @Autowired private ChannelMapper channelMapper; @Autowired @@ -748,7 +748,7 @@ public class TaskOperateHandler extends OperationAuthHandlerBase { ProcessTaskStepStatus.HANG) != null) { continue; } - flag = checkOperationAuthIsConfigured(processTaskVo, processTaskStep, ProcessTaskOperationType.STEP_TRANSFER, userUuid); + flag = checkOperationAuthIsConfigured(processTaskVo, processTaskStep, ProcessTaskStepOperationType.STEP_TRANSFER, userUuid); if (flag) { return true; } @@ -890,7 +890,7 @@ public class TaskOperateHandler extends OperationAuthHandlerBase { operationBiPredicateMap.put(ProcessTaskOperationType.TRANSFER_EOA_STEP, (processTaskVo, processTaskStepVo, userUuid, operationTypePermissionDeniedExceptionMap, extraParam) -> { Long id = processTaskVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.TRANSFER_EOA_STEP; + IOperationType operationType = ProcessTaskOperationType.TRANSFER_EOA_STEP; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { operationTypePermissionDeniedExceptionMap.computeIfAbsent(id, key -> new HashMap<>()) @@ -938,7 +938,7 @@ public class TaskOperateHandler extends OperationAuthHandlerBase { ProcessTaskStepStatus.HANG) != null) { continue; } - flag = checkOperationAuthIsConfigured(processTaskVo, processTaskStep, ProcessTaskOperationType.STEP_TRANSFER, userUuid); + flag = checkOperationAuthIsConfigured(processTaskVo, processTaskStep, ProcessTaskStepOperationType.STEP_TRANSFER, userUuid); if (flag) { return true; } @@ -959,7 +959,7 @@ public class TaskOperateHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java index f6b08e9c3..382b9360f 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java @@ -1,6 +1,8 @@ package neatlogic.module.process.operationauth.handler; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import com.alibaba.fastjson.JSONObject; +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; @@ -8,7 +10,6 @@ import neatlogic.framework.process.exception.operationauth.ProcessTaskTimerHandl import neatlogic.framework.process.operationauth.core.OperationAuthHandlerBase; import neatlogic.framework.process.operationauth.core.OperationAuthHandlerType; import neatlogic.framework.process.operationauth.core.TernaryPredicate; -import com.alibaba.fastjson.JSONObject; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -18,33 +19,33 @@ import java.util.Map; @Component public class TimerOperateHandler extends OperationAuthHandlerBase { - private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); + private final Map>, JSONObject>> operationBiPredicateMap = new HashMap<>(); @PostConstruct public void init() { - 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 ProcessTaskTimerHandlerNotEnableOperateException(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 ProcessTaskTimerHandlerNotEnableOperateException(operationType)); 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 ProcessTaskTimerHandlerNotEnableOperateException(operationType)); @@ -58,7 +59,7 @@ public class TimerOperateHandler extends OperationAuthHandlerBase { } @Override - public Map>, JSONObject>> + public Map>, JSONObject>> getOperationBiPredicateMap() { return operationBiPredicateMap; } diff --git a/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java index ca77a49b0..7a01c0af3 100644 --- a/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java @@ -18,7 +18,7 @@ package neatlogic.module.process.service; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; -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.stepremind.core.IProcessTaskStepRemindType; @@ -78,7 +78,7 @@ public interface IProcessStepHandlerUtil { * @Params:[currentProcessTaskStepVo, action] * @Returns:void **/ - void timeAudit(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskOperationType action); + void timeAudit(ProcessTaskStepVo currentProcessTaskStepVo, IOperationType action); /** * @Description: 记录操作活动 @@ -150,14 +150,14 @@ public interface IProcessStepHandlerUtil { * @Params:[currentProcessTaskStepVo, action] * @Returns:void **/ - void saveContentAndFile(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskOperationType action); + void saveContentAndFile(ProcessTaskStepVo currentProcessTaskStepVo, IOperationType action); /** * 保存工单级别的操作描述内容 * @param currentProcessTaskVo * @param action */ - void saveProcessTaskOperationContent(ProcessTaskVo currentProcessTaskVo, ProcessTaskOperationType action); + void saveProcessTaskOperationContent(ProcessTaskVo currentProcessTaskVo, IOperationType action); /** * 流转操作时检查回复信息是否必填 diff --git a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java index b9687e138..d1aa14f9e 100644 --- a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java @@ -207,11 +207,11 @@ public class NewWorkcenterServiceImpl implements NewWorkcenterService { for (ProcessTaskStepVo processStep : processTaskVo.getStepList()) { builder.addProcessTaskStepId(processStep.getId()); } - Map> operateTypeSetMap = + Map> operateTypeSetMap = builder.addOperationType(ProcessTaskOperationType.PROCESSTASK_ABORT) .addOperationType(ProcessTaskOperationType.PROCESSTASK_RECOVER) .addOperationType(ProcessTaskOperationType.PROCESSTASK_URGE) - .addOperationType(ProcessTaskOperationType.STEP_WORK).build().getOperateMap(); + .addOperationType(ProcessTaskStepOperationType.STEP_WORK).build().getOperateMap(); processTaskVo.getParamObj().put("isHasProcessTaskAuth", isHasProcessTaskAuth); taskJson = new JSONObject(); @@ -318,7 +318,7 @@ public class NewWorkcenterServiceImpl implements NewWorkcenterService { * @Params: [processTaskVo, operateTypeSetMap] * @Returns: com.alibaba.fastjson.JSONObject **/ - private JSONObject getTaskOperate(ProcessTaskVo processTaskVo, Map> operateTypeSetMap) { + private JSONObject getTaskOperate(ProcessTaskVo processTaskVo, Map> operateTypeSetMap) { JSONObject action = new JSONObject(); String processTaskStatus = processTaskVo.getStatus(); boolean isHasAbort = false; @@ -328,7 +328,7 @@ public class NewWorkcenterServiceImpl implements NewWorkcenterService { if ((ProcessTaskStatus.RUNNING.getValue().equals(processTaskStatus) || ProcessTaskStatus.DRAFT.getValue().equals(processTaskStatus) || ProcessTaskStatus.ABORTED.getValue().equals(processTaskStatus))) { - Set operationTypeSet = operateTypeSetMap.get(processTaskVo.getId()); + Set operationTypeSet = operateTypeSetMap.get(processTaskVo.getId()); if (CollectionUtils.isNotEmpty(operationTypeSet)) { if (operationTypeSet.contains(ProcessTaskOperationType.PROCESSTASK_ABORT)) { @@ -342,8 +342,8 @@ public class NewWorkcenterServiceImpl implements NewWorkcenterService { } } for (ProcessTaskStepVo step : processTaskVo.getStepList()) { - Set set = operateTypeSetMap.get(step.getId()); - if (set != null && set.contains(ProcessTaskOperationType.STEP_WORK)) { + Set set = operateTypeSetMap.get(step.getId()); + if (set != null && set.contains(ProcessTaskStepOperationType.STEP_WORK)) { JSONObject configJson = new JSONObject(); configJson.put("taskid", processTaskVo.getId()); configJson.put("stepid", step.getId()); diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 3b6759342..175cba82b 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -151,17 +151,56 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess * @Returns:void */ @Override - public void timeAudit(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskOperationType action) { + public void timeAudit(ProcessTaskStepVo currentProcessTaskStepVo, IOperationType action) { ProcessTaskStepTimeAuditVo lastTimeAuditVo = processTaskStepTimeAuditMapper .getLastProcessTaskStepTimeAuditByStepId(currentProcessTaskStepVo.getId()); ProcessTaskStepTimeAuditVo newAuditVo = new ProcessTaskStepTimeAuditVo(); newAuditVo.setProcessTaskStepId(currentProcessTaskStepVo.getId()); - switch (action) { - case STEP_ACTIVE: - newAuditVo.setActiveTime("now"); + if (action == ProcessTaskStepOperationType.STEP_ACTIVE) { + newAuditVo.setActiveTime("now"); + processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); + } else if (action == ProcessTaskStepOperationType.STEP_START) { + newAuditVo.setStartTime("now"); + if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getStartTime())) { + processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); + } else if (StringUtils.isBlank(lastTimeAuditVo.getStartTime())) {// 如果starttime为空，则更新starttime + newAuditVo.setId(lastTimeAuditVo.getId()); + processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); + } + } else if (action == ProcessTaskStepOperationType.STEP_COMPLETE) { + /* 如果找不到审计记录并且completetime不为空，则新建审计记录 **/ + newAuditVo.setCompleteTime("now"); + if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getCompleteTime())) { + processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); + } else if (StringUtils.isBlank(lastTimeAuditVo.getCompleteTime())) {// 如果completetime为空，则更新completetime + newAuditVo.setId(lastTimeAuditVo.getId()); + processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); + } + } else if (action == ProcessTaskOperationType.PROCESSTASK_ABORT) { + /* 如果找不到审计记录并且aborttime不为空，则新建审计记录 **/ + newAuditVo.setAbortTime("now"); + if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getAbortTime())) { processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - break; - case STEP_START: + } else if (StringUtils.isBlank(lastTimeAuditVo.getAbortTime())) {// 如果aborttime为空，则更新aborttime + newAuditVo.setId(lastTimeAuditVo.getId()); + processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); + } + } else if (action == ProcessTaskStepOperationType.STEP_BACK) { + /* 如果找不到审计记录并且backtime不为空，则新建审计记录 **/ + newAuditVo.setBackTime("now"); + if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getBackTime())) { + processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); + } else if (StringUtils.isBlank(lastTimeAuditVo.getBackTime())) {// 如果backtime为空，则更新backtime + newAuditVo.setId(lastTimeAuditVo.getId()); + processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); + } + } else if (action == ProcessTaskOperationType.PROCESSTASK_RECOVER) { + if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.PENDING.getValue())) { + newAuditVo.setActiveTime("now"); + if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getActiveTime())) { + processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); + } + } else if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.RUNNING.getValue())) { newAuditVo.setStartTime("now"); if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getStartTime())) { processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); @@ -169,63 +208,16 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess newAuditVo.setId(lastTimeAuditVo.getId()); processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); } - break; - case STEP_COMPLETE: - /* 如果找不到审计记录并且completetime不为空，则新建审计记录 **/ - newAuditVo.setCompleteTime("now"); - if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getCompleteTime())) { - processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - } else if (StringUtils.isBlank(lastTimeAuditVo.getCompleteTime())) {// 如果completetime为空，则更新completetime - newAuditVo.setId(lastTimeAuditVo.getId()); - processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); - } - break; - case PROCESSTASK_ABORT: - /* 如果找不到审计记录并且aborttime不为空，则新建审计记录 **/ - newAuditVo.setAbortTime("now"); - if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getAbortTime())) { - processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - } else if (StringUtils.isBlank(lastTimeAuditVo.getAbortTime())) {// 如果aborttime为空，则更新aborttime - newAuditVo.setId(lastTimeAuditVo.getId()); - processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); - } - break; - case STEP_BACK: - /* 如果找不到审计记录并且backtime不为空，则新建审计记录 **/ - newAuditVo.setBackTime("now"); - if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getBackTime())) { - processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - } else if (StringUtils.isBlank(lastTimeAuditVo.getBackTime())) {// 如果backtime为空，则更新backtime - newAuditVo.setId(lastTimeAuditVo.getId()); - processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); - } - break; - case PROCESSTASK_RECOVER: - if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.PENDING.getValue())) { - newAuditVo.setActiveTime("now"); - if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getActiveTime())) { - processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - } - } else if (currentProcessTaskStepVo.getStatus().equals(ProcessTaskStepStatus.RUNNING.getValue())) { - newAuditVo.setStartTime("now"); - if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getStartTime())) { - processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - } else if (StringUtils.isBlank(lastTimeAuditVo.getStartTime())) {// 如果starttime为空，则更新starttime - newAuditVo.setId(lastTimeAuditVo.getId()); - processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); - } - } - break; - case STEP_PAUSE: - /* 如果找不到审计记录并且pausetime不为空，则新建审计记录 **/ - newAuditVo.setPauseTime("now"); - if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getPauseTime())) { - processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); - } else if (StringUtils.isBlank(lastTimeAuditVo.getPauseTime())) {// 如果pausetime为空，则更新pausetime - newAuditVo.setId(lastTimeAuditVo.getId()); - processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); - } - break; + } + } else if (action == ProcessTaskStepOperationType.STEP_PAUSE) { + /* 如果找不到审计记录并且pausetime不为空，则新建审计记录 **/ + newAuditVo.setPauseTime("now"); + if (lastTimeAuditVo == null || StringUtils.isNotBlank(lastTimeAuditVo.getPauseTime())) { + processTaskStepTimeAuditMapper.insertProcessTaskStepTimeAudit(newAuditVo); + } else if (StringUtils.isBlank(lastTimeAuditVo.getPauseTime())) {// 如果pausetime为空，则更新pausetime + newAuditVo.setId(lastTimeAuditVo.getId()); + processTaskStepTimeAuditMapper.updateProcessTaskStepTimeAudit(newAuditVo); + } } } @@ -590,7 +582,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess * @Returns:void */ @Override - public void saveContentAndFile(ProcessTaskStepVo currentProcessTaskStepVo, ProcessTaskOperationType action) { + public void saveContentAndFile(ProcessTaskStepVo currentProcessTaskStepVo, IOperationType action) { JSONObject paramObj = currentProcessTaskStepVo.getParamObj(); String content = paramObj.getString("content"); List fileIdList = JSON.parseArray(JSON.toJSONString(paramObj.getJSONArray("fileIdList")), Long.class); @@ -641,7 +633,7 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess } @Override - public void saveProcessTaskOperationContent(ProcessTaskVo currentProcessTaskVo, ProcessTaskOperationType action) { + public void saveProcessTaskOperationContent(ProcessTaskVo currentProcessTaskVo, IOperationType action) { JSONObject paramObj = currentProcessTaskVo.getParamObj(); String content = paramObj.getString("content"); if (content == null) { diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java index 9d7f26d96..c09a7d2c8 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskAutomaticServiceImpl.java @@ -493,7 +493,7 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ List nextStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); // currentProcessTaskStepVo.getParamObj().put("nextStepId", nextStepIdList.get(0)); JSONObject jsonParam = currentProcessTaskStepVo.getParamObj(); - jsonParam.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + jsonParam.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); jsonParam.put("nextStepId", nextStepIdList.get(0)); jsonParam.put(ProcessTaskAuditDetailType.AUTOMATICINFO.getParamName(), data); IProcessStepHandler processHandler = ProcessStepHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); @@ -618,7 +618,7 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ List nextStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(currentProcessTaskStepVo.getId(), ProcessFlowDirection.FORWARD.getValue()); // currentProcessTaskStepVo.getParamObj().put("nextStepId", nextStepIdList.get(0)); JSONObject jsonParam = currentProcessTaskStepVo.getParamObj(); - jsonParam.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + jsonParam.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); jsonParam.put("nextStepId", nextStepIdList.get(0)); jsonParam.put(ProcessTaskAuditDetailType.AUTOMATICINFO.getParamName(), data); IProcessStepHandler processHandler = ProcessStepHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); @@ -765,7 +765,7 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ if (processHandler != null) { processStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, nextProcessTaskStepVo.getId(), failedReason, ProcessTaskStepRemindType.AUTOMATIC_ERROR); JSONObject jsonParam = currentProcessTaskStepVo.getParamObj(); - jsonParam.put("action", ProcessTaskOperationType.STEP_BACK.getValue()); + jsonParam.put("action", ProcessTaskStepOperationType.STEP_BACK.getValue()); jsonParam.put("nextStepId", nextProcessTaskStepVo.getId()); jsonParam.put("content", failedReason); jsonParam.put(ProcessTaskAuditDetailType.AUTOMATICINFO.getParamName(), automaticInfo); @@ -778,7 +778,7 @@ public class ProcessTaskAutomaticServiceImpl implements ProcessTaskAutomaticServ processStepHandlerUtil.saveStepRemind(currentProcessTaskStepVo, nextStepIdList.get(0), failedReason, ProcessTaskStepRemindType.AUTOMATIC_ERROR); // currentProcessTaskStepVo.getParamObj().put("nextStepId", nextStepIdList.get(0)); JSONObject jsonParam = currentProcessTaskStepVo.getParamObj(); - jsonParam.put("action", ProcessTaskOperationType.STEP_COMPLETE.getValue()); + jsonParam.put("action", ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); jsonParam.put("nextStepId", nextStepIdList.get(0)); jsonParam.put(ProcessTaskAuditDetailType.AUTOMATICINFO.getParamName(), automaticInfo); processHandler.autoComplete(currentProcessTaskStepVo); diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java index d158498c0..7368e3a87 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java @@ -21,10 +21,7 @@ import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.notify.dto.NotifyReceiverVo; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.constvalue.ProcessTaskStatus; -import neatlogic.framework.process.constvalue.ProcessTaskStepStatus; -import neatlogic.framework.process.constvalue.ProcessUserType; +import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; @@ -166,7 +163,7 @@ public interface ProcessTaskService { * @Returns:boolean **/ public boolean checkOperationAuthIsConfigured(ProcessTaskStepVo processTaskStepVo, String owner, String reporter, - ProcessTaskOperationType operationType, String userUuid); + IOperationType operationType, String userUuid); /** * @Description: 检查当前用户是否配置该权限 @@ -175,7 +172,7 @@ public interface ProcessTaskService { * @Params:[processTaskVo, operationType, userUuid] * @Returns:boolean **/ - public boolean checkOperationAuthIsConfigured(ProcessTaskVo processTaskVo, ProcessTaskOperationType operationType, + public boolean checkOperationAuthIsConfigured(ProcessTaskVo processTaskVo, IOperationType operationType, String userUuid); /** diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 604299f22..73211a117 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -1141,7 +1141,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC */ @Override public boolean checkOperationAuthIsConfigured(ProcessTaskStepVo processTaskStepVo, String owner, String reporter, - ProcessTaskOperationType operationType, String userUuid) { + IOperationType operationType, String userUuid) { JSONArray authorityList = null; String stepConfig = selectContentByHashMapper.getProcessTaskStepConfigByHash(processTaskStepVo.getConfigHash()); Integer enableAuthority = (Integer) JSONPath.read(stepConfig, "enableAuthority"); @@ -1178,7 +1178,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC * @return 是否拥有权限 */ @Override - public boolean checkOperationAuthIsConfigured(ProcessTaskVo processTaskVo, ProcessTaskOperationType operationType, + public boolean checkOperationAuthIsConfigured(ProcessTaskVo processTaskVo, IOperationType operationType, String userUuid) { String config = selectContentByHashMapper.getProcessTaskConfigStringByHash(processTaskVo.getConfigHash()); JSONArray authorityList = (JSONArray) JSONPath.read(config, "process.processConfig.authorityList"); @@ -1191,7 +1191,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } private boolean checkOperationAuthIsConfigured(Long processTaskId, Long processTaskStepId, String owner, - String reporter, ProcessTaskOperationType operationType, JSONArray authorityList, String userUuid) { + String reporter, IOperationType operationType, JSONArray authorityList, String userUuid) { for (int i = 0; i < authorityList.size(); i++) { JSONObject authorityObj = authorityList.getJSONObject(i); String action = authorityObj.getString("action"); @@ -1306,7 +1306,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC if (handler != null) { if (ProcessStepMode.MT == handler.getMode()) {// 手动处理节点 if (checkOperationAuthIsConfigured(fromStep, processTaskVo.getOwner(), processTaskVo.getReporter(), - ProcessTaskOperationType.STEP_RETREAT, userUuid)) { + ProcessTaskStepOperationType.STEP_RETREAT, userUuid)) { resultList.add(fromStep); } } else {// 自动处理节点，继续找前置节点 @@ -1383,7 +1383,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC continue; } if (checkOperationAuthIsConfigured(stepVo, processTaskVo.getOwner(), processTaskVo.getReporter(), - ProcessTaskOperationType.STEP_TRANSFER, userUuid)) { + ProcessTaskStepOperationType.STEP_TRANSFER, userUuid)) { resultSet.add(stepVo); } } @@ -2014,12 +2014,12 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC processTaskStepVo.setHandlerStepInfo(processStepUtilHandler.getNonStartStepInfo(processTaskStepVo)); // 步骤评论列表 List typeList = new ArrayList<>(); - typeList.add(ProcessTaskOperationType.STEP_COMMENT.getValue()); - typeList.add(ProcessTaskOperationType.STEP_COMPLETE.getValue()); - typeList.add(ProcessTaskOperationType.STEP_BACK.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_COMPLETE.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskOperationType.STEP_REAPPROVAL.getValue()); + typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); processTaskStepVo.setCommentList(getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepId, typeList)); @@ -2440,49 +2440,49 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC List processTaskStepList = processTaskMapper.getProcessTaskStepBaseInfoByProcessTaskId(processTaskId); List processTaskStepIdList = processTaskStepList.stream().map(ProcessTaskStepVo::getId).collect(Collectors.toList()); ProcessAuthManager.Builder builder = new ProcessAuthManager.Builder().addProcessTaskId(processTaskId).addProcessTaskStepId(processTaskStepIdList); - ProcessTaskOperationType actionType = null; - if (ProcessTaskOperationType.STEP_ACCEPT.getValue().equals(action)) { - actionType = ProcessTaskOperationType.STEP_ACCEPT; + ProcessTaskStepOperationType actionType = null; + if (ProcessTaskStepOperationType.STEP_ACCEPT.getValue().equals(action)) { + actionType = ProcessTaskStepOperationType.STEP_ACCEPT; builder.addOperationType(actionType); - } else if (ProcessTaskOperationType.STEP_START.getValue().equals(action)) { - actionType = ProcessTaskOperationType.STEP_START; + } else if (ProcessTaskStepOperationType.STEP_START.getValue().equals(action)) { + actionType = ProcessTaskStepOperationType.STEP_START; builder.addOperationType(actionType); - } else if (ProcessTaskOperationType.STEP_COMPLETE.getValue().equals(action)) { - actionType = ProcessTaskOperationType.STEP_COMPLETE; + } else if (ProcessTaskStepOperationType.STEP_COMPLETE.getValue().equals(action)) { + actionType = ProcessTaskStepOperationType.STEP_COMPLETE; builder.addOperationType(actionType); - } else if (ProcessTaskOperationType.STEP_RECOVER.getValue().equals(action)) { - actionType = ProcessTaskOperationType.STEP_RECOVER; + } else if (ProcessTaskStepOperationType.STEP_RECOVER.getValue().equals(action)) { + actionType = ProcessTaskStepOperationType.STEP_RECOVER; builder.addOperationType(actionType); - } else if (ProcessTaskOperationType.STEP_PAUSE.getValue().equals(action)) { - actionType = ProcessTaskOperationType.STEP_PAUSE; + } else if (ProcessTaskStepOperationType.STEP_PAUSE.getValue().equals(action)) { + actionType = ProcessTaskStepOperationType.STEP_PAUSE; builder.addOperationType(actionType); } else { - builder.addOperationType(ProcessTaskOperationType.STEP_ACCEPT); - builder.addOperationType(ProcessTaskOperationType.STEP_START); - builder.addOperationType(ProcessTaskOperationType.STEP_COMPLETE); - builder.addOperationType(ProcessTaskOperationType.STEP_RECOVER); - builder.addOperationType(ProcessTaskOperationType.STEP_PAUSE); + builder.addOperationType(ProcessTaskStepOperationType.STEP_ACCEPT); + builder.addOperationType(ProcessTaskStepOperationType.STEP_START); + builder.addOperationType(ProcessTaskStepOperationType.STEP_COMPLETE); + builder.addOperationType(ProcessTaskStepOperationType.STEP_RECOVER); + builder.addOperationType(ProcessTaskStepOperationType.STEP_PAUSE); } String userUuid = UserContext.get().getUserUuid(true); AuthenticationInfoVo authenticationInfoVo = UserContext.get().getAuthenticationInfoVo(); - Map> operationTypeSetMap = builder.build().getOperateMap(); + Map> operationTypeSetMap = builder.build().getOperateMap(); for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { - Set set = operationTypeSetMap.get(processTaskStepVo.getId()); + Set set = operationTypeSetMap.get(processTaskStepVo.getId()); if (CollectionUtils.isNotEmpty(set)) { if (actionType != null) { if (set.contains(actionType)) { resultList.add(processTaskStepVo); } } else { - if (set.contains(ProcessTaskOperationType.STEP_ACCEPT)) { + if (set.contains(ProcessTaskStepOperationType.STEP_ACCEPT)) { resultList.add(processTaskStepVo); - } else if (set.contains(ProcessTaskOperationType.STEP_START)) { + } else if (set.contains(ProcessTaskStepOperationType.STEP_START)) { resultList.add(processTaskStepVo); - } else if (set.contains(ProcessTaskOperationType.STEP_COMPLETE)) { + } else if (set.contains(ProcessTaskStepOperationType.STEP_COMPLETE)) { resultList.add(processTaskStepVo); - } else if (set.contains(ProcessTaskOperationType.STEP_RECOVER)) { + } else if (set.contains(ProcessTaskStepOperationType.STEP_RECOVER)) { resultList.add(processTaskStepVo); - } else if (set.contains(ProcessTaskOperationType.STEP_PAUSE)) { + } else if (set.contains(ProcessTaskStepOperationType.STEP_PAUSE)) { resultList.add(processTaskStepVo); } } @@ -2877,7 +2877,7 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } String action = paramObj.getString("action"); processTaskStepVo.getParamObj().put("source", paramObj.getString("source")); - if (ProcessTaskOperationType.STEP_ACCEPT.getValue().equals(action)) { + if (ProcessTaskStepOperationType.STEP_ACCEPT.getValue().equals(action)) { handler.accept(processTaskStepVo); } handler.start(processTaskStepVo); @@ -2938,18 +2938,18 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC || ChangeProcessStepHandlerType.CHANGEHANDLE.getHandler().equals(currentStep.getHandler())) { throw new ProcessTaskStepMustBeManualException(currentStep.getProcessTaskId(), currentStep.getName()); } - Map> auth = checkProcessTaskStepCompleteAuth(user, authenticationInfo, currentStep); + Map> auth = checkProcessTaskStepCompleteAuth(user, authenticationInfo, currentStep); if (MapUtils.isEmpty(auth) || auth.values().stream().findFirst().get().isEmpty()) { noAuthProcessTaskIdList.add(currentStep.getProcessTaskId()); continue; } - ProcessTaskOperationType operationType = auth.values().stream().findFirst().get().stream().findFirst().get(); - if (ProcessTaskOperationType.STEP_ACCEPT.getValue().equals(operationType.getValue()) - || ProcessTaskOperationType.STEP_START.getValue().equals(operationType.getValue())) { + IOperationType operationType = auth.values().stream().findFirst().get().stream().findFirst().get(); + if (ProcessTaskStepOperationType.STEP_ACCEPT.getValue().equals(operationType.getValue()) + || ProcessTaskStepOperationType.STEP_START.getValue().equals(operationType.getValue())) { JSONObject param = new JSONObject(); param.put("processTaskId", currentStep.getProcessTaskId()); param.put("processTaskStepId", currentStep.getId()); - if (ProcessTaskOperationType.STEP_ACCEPT.getValue().equals(operationType.getValue())) { + if (ProcessTaskStepOperationType.STEP_ACCEPT.getValue().equals(operationType.getValue())) { param.put("action", "accept"); } else { param.put("action", "start"); @@ -2988,14 +2988,14 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC * @param authenticationInfo 处理人权限 * @param processTaskStepVo 工单步骤 */ - private Map> checkProcessTaskStepCompleteAuth(UserVo user, AuthenticationInfoVo authenticationInfo, ProcessTaskStepVo processTaskStepVo) { + private Map> checkProcessTaskStepCompleteAuth(UserVo user, AuthenticationInfoVo authenticationInfo, ProcessTaskStepVo processTaskStepVo) { UserContext.init(user, authenticationInfo, SystemUser.SYSTEM.getTimezone()); ProcessAuthManager.Builder builder = new ProcessAuthManager.Builder(); builder.addProcessTaskId(processTaskStepVo.getProcessTaskId()); builder.addProcessTaskStepId(processTaskStepVo.getId()); - return builder.addOperationType(ProcessTaskOperationType.STEP_START) - .addOperationType(ProcessTaskOperationType.STEP_ACCEPT) - .addOperationType(ProcessTaskOperationType.STEP_COMPLETE) + return builder.addOperationType(ProcessTaskStepOperationType.STEP_START) + .addOperationType(ProcessTaskStepOperationType.STEP_ACCEPT) + .addOperationType(ProcessTaskStepOperationType.STEP_COMPLETE) .build().getOperateMap(); } diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java index 10b3b1536..4f64c835c 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java @@ -662,7 +662,7 @@ public class ProcessTaskStepTaskServiceImpl implements ProcessTaskStepTaskServic @Override public int checkIsReplyable(ProcessTaskVo processTaskVo, ProcessTaskStepVo processTaskStepVo, String stepTaskUserUuid, Long stepTaskUserId) throws ProcessTaskPermissionDeniedException { Long id = processTaskStepVo.getId(); - ProcessTaskOperationType operationType = ProcessTaskOperationType.TASK_COMPLETE; + IOperationType operationType = ProcessTaskStepOperationType.TASK_COMPLETE; //1.判断工单是否被隐藏，如果isShow=0，则提示“工单已隐藏”； if (processTaskVo.getIsShow() == 0) { throw new ProcessTaskHiddenException(); diff --git a/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java index ef039bf55..ecc3c89b8 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/DistributaryProcessComponent.java @@ -1,13 +1,13 @@ package neatlogic.module.process.stephandler.component; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; import neatlogic.framework.process.constvalue.ProcessStepMode; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.exception.processtask.ProcessTaskException; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerBase; -import com.alibaba.fastjson.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -75,7 +75,7 @@ public class DistributaryProcessComponent extends ProcessStepHandlerBase { protected Set myGetNext(ProcessTaskStepVo currentProcessTaskStepVo, List nextStepIdList, Long nextStepId) throws ProcessTaskException { JSONObject paramObj = currentProcessTaskStepVo.getParamObj(); String action = paramObj.getString("action"); - if (ProcessTaskOperationType.STEP_BACK.getValue().equals(action)) { + if (ProcessTaskStepOperationType.STEP_BACK.getValue().equals(action)) { return new HashSet<>(); } else { return new HashSet<>(nextStepIdList); diff --git a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java index 89068b281..b9ff2bd3d 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/TimerProcessComponent.java @@ -228,7 +228,7 @@ public class TimerProcessComponent extends ProcessStepHandlerBase { ProcessTaskStepInOperationVo processTaskStepInOperationVo = new ProcessTaskStepInOperationVo( currentProcessTaskStepVo.getProcessTaskId(), currentProcessTaskStepVo.getId(), - ProcessTaskOperationType.STEP_COMPLETE.getValue() + ProcessTaskStepOperationType.STEP_COMPLETE.getValue() ); IProcessStepInternalHandler processStepInternalHandler = ProcessStepInternalHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); if (processStepInternalHandler == null) { diff --git a/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java b/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java index d62f5ed07..cd6e624fb 100644 --- a/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java +++ b/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java @@ -21,7 +21,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.GroupSearch; import neatlogic.framework.process.constvalue.IOperationType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.stephandler.core.IProcessTaskOperatePostProcessor; @@ -56,24 +56,24 @@ public class ProcessTaskStepCostPostProcessor implements IProcessTaskOperatePost Long processTaskStepId = currentProcessTaskStepVo.getId(); JSONObject otherParam = currentProcessTaskStepVo.getParamObj(); List list = new ArrayList<>(); - list.add(ProcessTaskOperationType.STEP_ACTIVE); - list.add(ProcessTaskOperationType.STEP_ACCEPT); - list.add(ProcessTaskOperationType.STEP_START); - list.add(ProcessTaskOperationType.STEP_COMPLETE); - list.add(ProcessTaskOperationType.STEP_BACK); - list.add(ProcessTaskOperationType.STEP_PAUSE); - list.add(ProcessTaskOperationType.STEP_TRANSFER); - list.add(ProcessTaskOperationType.STEP_RECOVER); - list.add(ProcessTaskOperationType.STEP_RETREAT); - list.add(ProcessTaskOperationType.STEP_REDO); - list.add(ProcessTaskOperationType.STEP_REAPPROVAL); + list.add(ProcessTaskStepOperationType.STEP_ACTIVE); + list.add(ProcessTaskStepOperationType.STEP_ACCEPT); + list.add(ProcessTaskStepOperationType.STEP_START); + list.add(ProcessTaskStepOperationType.STEP_COMPLETE); + list.add(ProcessTaskStepOperationType.STEP_BACK); + list.add(ProcessTaskStepOperationType.STEP_PAUSE); + list.add(ProcessTaskStepOperationType.STEP_TRANSFER); + list.add(ProcessTaskStepOperationType.STEP_RECOVER); + list.add(ProcessTaskStepOperationType.STEP_RETREAT); + list.add(ProcessTaskStepOperationType.STEP_REDO); + list.add(ProcessTaskStepOperationType.STEP_REAPPROVAL); if (list.contains(operationType)) { Date operateTime = otherParam.getDate("operateTime"); if (operateTime == null) { operateTime = new Date(); } String stepStatus = currentProcessTaskStepVo.getStatus(); - if (ProcessTaskOperationType.STEP_COMPLETE == operationType || ProcessTaskOperationType.STEP_BACK == operationType) { + if (ProcessTaskStepOperationType.STEP_COMPLETE == operationType || ProcessTaskStepOperationType.STEP_BACK == operationType) { List workerList = new ArrayList<>(); List processTaskStepUserList = processTaskMapper.getProcessTaskStepUserByStepId(processTaskStepId, ProcessUserType.MAJOR.getValue()); if (CollectionUtils.isNotEmpty(processTaskStepUserList)) { diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java index f18071404..bfee54cc8 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java @@ -6,9 +6,7 @@ import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; -import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.constvalue.ProcessTaskStatus; +import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; @@ -55,7 +53,7 @@ public class AutomaticProcessUtilHandler extends ProcessStepInternalHandlerBase currentProcessTaskStepVo.getId(), currentProcessTaskStepVo.getHandler(), SystemUser.SYSTEM.getUserUuid())); JSONObject stepDataJson = stepDataVo.getData(); boolean hasComplete = - new ProcessAuthManager.StepOperationChecker(currentProcessTaskStepVo.getId(), ProcessTaskOperationType.STEP_COMPLETE) + new ProcessAuthManager.StepOperationChecker(currentProcessTaskStepVo.getId(), ProcessTaskStepOperationType.STEP_COMPLETE) .build().check(); if (hasComplete) {// 有处理权限 stepDataJson.put("isStepUser", 1); @@ -179,20 +177,20 @@ public class AutomaticProcessUtilHandler 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); @@ -216,9 +214,9 @@ public class AutomaticProcessUtilHandler 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"); @@ -238,11 +236,11 @@ public class AutomaticProcessUtilHandler extends ProcessStepInternalHandlerBase resultObj.put("notifyPolicyConfig", invokeNotifyPolicyConfigVo); /** 按钮映射列表 **/ - 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); diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java index f787533d8..0d1fedc6b 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java @@ -6,9 +6,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; -import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; -import neatlogic.framework.process.constvalue.ProcessUserType; +import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo; import neatlogic.framework.process.dto.processconfig.ActionConfigVo; @@ -129,23 +127,23 @@ public class OmnipotentProcessUtilHandler 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 }; @@ -168,12 +166,12 @@ public class OmnipotentProcessUtilHandler extends ProcessStepInternalHandlerBase return resultObj; } - public ProcessTaskOperationType[] getStepActions() { - return new ProcessTaskOperationType[]{ - ProcessTaskOperationType.STEP_VIEW, - ProcessTaskOperationType.STEP_TRANSFER, - ProcessTaskOperationType.STEP_PAUSE, - ProcessTaskOperationType.STEP_RETREAT + public IOperationType[] getStepActions() { + return new IOperationType[]{ + ProcessTaskStepOperationType.STEP_VIEW, + ProcessTaskStepOperationType.STEP_TRANSFER, + ProcessTaskStepOperationType.STEP_PAUSE, + ProcessTaskStepOperationType.STEP_RETREAT }; } @@ -185,11 +183,11 @@ public class OmnipotentProcessUtilHandler 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"); @@ -219,15 +217,15 @@ public class OmnipotentProcessUtilHandler 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); resultObj.put("customButtonList", customButtonArray); diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java index fdbd31214..947e773ac 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/TimerProcessUtilHandler.java @@ -18,7 +18,7 @@ package neatlogic.module.process.stephandler.utilhandler; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.process.constvalue.ProcessStepHandlerType; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; import neatlogic.framework.process.dto.ProcessTaskStepTimerVo; @@ -116,11 +116,11 @@ public class TimerProcessUtilHandler extends ProcessStepInternalHandlerBase { resultObj.put("enableAuthority", 1); JSONArray authorityArray = new JSONArray(); authorityArray.add(new JSONObject() {{ - this.put("action", ProcessTaskOperationType.STEP_VIEW.getValue()); - this.put("text", ProcessTaskOperationType.STEP_VIEW.getText()); - this.put("defaultValue", ProcessTaskOperationType.STEP_VIEW.getDefaultValue()); - this.put("acceptList", ProcessTaskOperationType.STEP_VIEW.getDefaultValue()); - this.put("groupList", ProcessTaskOperationType.STEP_VIEW.getGroupList()); + this.put("action", ProcessTaskStepOperationType.STEP_VIEW.getValue()); + this.put("text", ProcessTaskStepOperationType.STEP_VIEW.getText()); + this.put("defaultValue", ProcessTaskStepOperationType.STEP_VIEW.getDefaultValue()); + this.put("acceptList", ProcessTaskStepOperationType.STEP_VIEW.getDefaultValue()); + this.put("groupList", ProcessTaskStepOperationType.STEP_VIEW.getGroupList()); }}); resultObj.put("authorityList", authorityArray); /** 分配处理人 **/ diff --git a/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java b/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java index d3f73aa92..4f9103347 100755 --- a/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java +++ b/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java @@ -3,7 +3,7 @@ package neatlogic.module.process.workcenter.operate; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.constvalue.IOperationType; public class WorkcenterBuildOperateBuilder { JSONObject buildOperateJson = new JSONObject(); @@ -12,7 +12,7 @@ public class WorkcenterBuildOperateBuilder { return buildOperateJson; } - public WorkcenterBuildOperateBuilder setOperate(ProcessTaskOperationType action) { + public WorkcenterBuildOperateBuilder setOperate(IOperationType action) { buildOperateJson.put("name", action.getValue()); buildOperateJson.put("text", action.getText()); return this; diff --git a/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterOperateBuilder.java b/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterOperateBuilder.java index d3c606c91..1749a19a3 100755 --- a/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterOperateBuilder.java +++ b/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterOperateBuilder.java @@ -1,11 +1,12 @@ package neatlogic.module.process.workcenter.operate; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStatus; +import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.ProcessTaskVo; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; import java.util.Comparator; @@ -25,7 +26,7 @@ public class WorkcenterOperateBuilder { if (CollectionUtils.isNotEmpty(handleArray)) { isEnable = 1; } - JSONObject operateJson = new WorkcenterBuildOperateBuilder().setOperate(ProcessTaskOperationType.STEP_WORK).setSort(1) + JSONObject operateJson = new WorkcenterBuildOperateBuilder().setOperate(ProcessTaskStepOperationType.STEP_WORK).setSort(1) .setIsEnable(isEnable).setHandleArray(handleArray).build(); operateJson.put("text", "处理"); operateArray.add(operateJson); -- Gitee From 0ef1208be72f41c1f6b3e4b48700a0df9d559338 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 21 Nov 2024 17:53:31 +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 --- .../module/process/api/processtask/ProcessTaskAuditListApi.java | 2 +- .../api/processtask/ProcessTaskCurrentUserTaskListApi.java | 2 +- .../process/api/processtask/ProcessTaskNextStepListApi.java | 2 +- .../process/api/processtask/ProcessTaskStepActionListApi.java | 2 +- .../module/process/api/processtask/ProcessTaskStepGetApi.java | 2 +- .../process/api/processtask/ProcessTaskStepGetBackupApi.java | 2 +- .../module/process/api/processtask/ProcessTaskStepListApi.java | 1 + .../api/processtask/ProcessTaskStepStartIfNecessaryApi.java | 2 +- .../process/operationauth/handler/AutomaticOperateHandler.java | 2 +- .../process/operationauth/handler/OmnipotentOperateHandler.java | 2 +- .../process/operationauth/handler/StepOperateHandler.java | 1 + .../process/operationauth/handler/TaskOperateHandler.java | 1 + .../process/operationauth/handler/TimerOperateHandler.java | 2 +- .../module/process/service/IProcessStepHandlerUtil.java | 2 +- .../module/process/service/NewWorkcenterServiceImpl.java | 1 + .../module/process/service/ProcessStepHandlerUtil.java | 1 + .../neatlogic/module/process/service/ProcessTaskService.java | 1 + .../module/process/service/ProcessTaskServiceImpl.java | 1 + .../module/process/service/ProcessTaskStepTaskServiceImpl.java | 1 + .../postprocessor/ProcessTaskStepCostPostProcessor.java | 2 +- .../stephandler/utilhandler/AutomaticProcessUtilHandler.java | 1 + .../stephandler/utilhandler/OmnipotentProcessUtilHandler.java | 1 + .../workcenter/operate/WorkcenterBuildOperateBuilder.java | 2 +- 23 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java index e06eacc18..ae2724405 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAuditListApi.java @@ -12,7 +12,7 @@ import neatlogic.framework.process.audithandler.core.IProcessTaskStepAuditDetail import neatlogic.framework.process.audithandler.core.ProcessTaskAuditDetailTypeFactory; import neatlogic.framework.process.audithandler.core.ProcessTaskStepAuditDetailHandlerFactory; import neatlogic.framework.process.auth.PROCESS_BASE; -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.ProcessTaskStepAuditDetailVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java index f67bb6118..883f896f9 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCurrentUserTaskListApi.java @@ -8,7 +8,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.BasePageVo; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.SlaStatus; import neatlogic.framework.process.dto.*; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java index 3c4b70920..d68ef208b 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskNextStepListApi.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.dto.AssignableWorkerStepVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java index 0586228c6..cd7ba3d0e 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepActionListApi.java @@ -5,7 +5,7 @@ import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.common.dto.ValueTextVo; import neatlogic.framework.process.auth.PROCESS_BASE; -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.operationauth.core.ProcessAuthManager; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java index aff82e576..34a47ae84 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetApi.java @@ -8,7 +8,7 @@ import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.config.ConfigManager; import neatlogic.framework.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ItsmTenantConfig; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java index adaedde79..5e85ec3e1 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepGetBackupApi.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStatus; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java index 0e4ce5ca7..e2083ed4a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepListApi.java @@ -12,6 +12,7 @@ import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; import neatlogic.framework.process.exception.process.ProcessStepUtilHandlerNotFoundException; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java index aa2478e86..00e0d2d26 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.restful.annotation.Description; diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java index 5c8ccf7b6..4888db710 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/AutomaticOperateHandler.java @@ -1,7 +1,7 @@ package neatlogic.module.process.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/process/operationauth/handler/OmnipotentOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java index fa49a1cc3..cc977a82d 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/OmnipotentOperateHandler.java @@ -1,7 +1,7 @@ package neatlogic.module.process.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/process/operationauth/handler/StepOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java index 84d9e17a2..b84f78599 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/StepOperateHandler.java @@ -13,6 +13,7 @@ import neatlogic.framework.process.dto.ProcessTaskStepUserVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; 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.OperationAuthHandlerType; import neatlogic.framework.process.operationauth.core.TernaryPredicate; diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java index b8808381c..66a351afe 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/TaskOperateHandler.java @@ -6,6 +6,7 @@ import neatlogic.framework.common.constvalue.SystemUser; import neatlogic.framework.dto.AuthenticationInfoVo; import neatlogic.framework.process.auth.PROCESSTASK_MODIFY; import neatlogic.framework.process.constvalue.*; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.module.process.dao.mapper.catalog.CatalogMapper; import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; diff --git a/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java b/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java index 382b9360f..5bb6f9292 100644 --- a/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java +++ b/src/main/java/neatlogic/module/process/operationauth/handler/TimerOperateHandler.java @@ -1,7 +1,7 @@ package neatlogic.module.process.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/process/service/IProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java index 7a01c0af3..a63712563 100644 --- a/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/IProcessStepHandlerUtil.java @@ -18,7 +18,7 @@ package neatlogic.module.process.service; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; -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.stepremind.core.IProcessTaskStepRemindType; diff --git a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java index d1aa14f9e..ded418e8c 100644 --- a/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/NewWorkcenterServiceImpl.java @@ -36,6 +36,7 @@ import neatlogic.framework.process.column.core.IProcessTaskColumn; import neatlogic.framework.process.column.core.ProcessTaskColumnFactory; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 175cba82b..63d5700fe 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -38,6 +38,7 @@ import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.crossover.IProcessStepHandlerCrossoverUtil; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.processtask.*; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.stepremind.core.IProcessTaskStepRemindType; import neatlogic.framework.process.workerpolicy.core.IWorkerPolicyHandler; import neatlogic.framework.process.workerpolicy.core.WorkerPolicyHandlerFactory; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java index 7368e3a87..18da008de 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java @@ -24,6 +24,7 @@ import neatlogic.framework.notify.dto.NotifyReceiverVo; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.exception.operationauth.ProcessTaskPermissionDeniedException; +import neatlogic.framework.process.operationauth.core.IOperationType; import java.util.List; import java.util.Map; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index 73211a117..37ac9b02b 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -64,6 +64,7 @@ import neatlogic.framework.process.exception.processtask.*; import neatlogic.framework.process.exception.processtask.task.ProcessTaskStepTaskNotCompleteException; import neatlogic.framework.process.fulltextindex.ProcessFullTextIndexType; import neatlogic.framework.process.notify.constvalue.ProcessTaskStepNotifyTriggerType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.*; import neatlogic.framework.process.stepremind.core.ProcessTaskStepRemindTypeFactory; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java index 4f64c835c..821e50725 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskStepTaskServiceImpl.java @@ -22,6 +22,7 @@ import neatlogic.framework.dto.UserVo; import neatlogic.framework.file.dao.mapper.FileMapper; import neatlogic.framework.file.dto.FileVo; import neatlogic.framework.process.constvalue.*; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepTaskMapper; import neatlogic.module.process.dao.mapper.SelectContentByHashMapper; diff --git a/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java b/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java index cd6e624fb..58728a6f1 100644 --- a/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java +++ b/src/main/java/neatlogic/module/process/stephandler/postprocessor/ProcessTaskStepCostPostProcessor.java @@ -20,7 +20,7 @@ package neatlogic.module.process.stephandler.postprocessor; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.asynchronization.threadlocal.UserContext; import neatlogic.framework.common.constvalue.GroupSearch; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.constvalue.ProcessTaskStepOperationType; import neatlogic.framework.process.constvalue.ProcessUserType; import neatlogic.framework.process.dto.*; diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java index bfee54cc8..abe890dc2 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/AutomaticProcessUtilHandler.java @@ -15,6 +15,7 @@ import neatlogic.framework.process.dto.processconfig.AutomaticCallbackConfigVo; import neatlogic.framework.process.dto.processconfig.AutomaticIntervalCallbackConfigVo; import neatlogic.framework.process.dto.processconfig.AutomaticRequestConfigVo; import neatlogic.framework.process.dto.processconfig.AutomaticTimeWindowConfigVo; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java index 0d1fedc6b..dfe004e11 100644 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/OmnipotentProcessUtilHandler.java @@ -10,6 +10,7 @@ import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.dto.*; import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo; import neatlogic.framework.process.dto.processconfig.ActionConfigVo; +import neatlogic.framework.process.operationauth.core.IOperationType; import neatlogic.framework.process.stephandler.core.IProcessStepAssistantHandler; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; diff --git a/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java b/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java index 4f9103347..55c9637c4 100755 --- a/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java +++ b/src/main/java/neatlogic/module/process/workcenter/operate/WorkcenterBuildOperateBuilder.java @@ -3,7 +3,7 @@ package neatlogic.module.process.workcenter.operate; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import neatlogic.framework.process.constvalue.IOperationType; +import neatlogic.framework.process.operationauth.core.IOperationType; public class WorkcenterBuildOperateBuilder { JSONObject buildOperateJson = new JSONObject(); -- Gitee