diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java index 3dc808c018a85d7b1ffec4aa2f176541312031b6..bc7e3c5b30988221f61acae6d1c3b2ecd36854d5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchAbortProcessTaskApi.java @@ -42,10 +42,11 @@ public class BatchAbortProcessTaskApi extends PrivateApiComponentBase { public String getName() { return "nmpap.batchabortprocesstaskapi.getname"; } + @Input({ @Param(name = "processTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, minSize = 1, desc = "term.itsm.processtaskidlist"), @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), }) @Output({}) @Description(desc = "nmpap.batchabortprocesstaskapi.getname") diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java index 80afe8a7e63fed8a3966464fcbcaa207964c80bd..27d3eca65149e35abba0359412055473e909aa7e 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchDeleteProcessTaskApi.java @@ -55,7 +55,7 @@ public class BatchDeleteProcessTaskApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, minSize = 1, desc = "term.itsm.processtaskidlist"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source") + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) @Description(desc = "nmpap.batchdeleteprocesstaskapi.getname") @@ -78,7 +78,7 @@ public class BatchDeleteProcessTaskApi extends PrivateApiComponentBase { ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(processTaskId, null); processStepHandlerUtil.action(processTaskStepVo, ProcessTaskNotifyTriggerType.DELETEPROCESSTASK); processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskNotifyTriggerType.DELETEPROCESSTASK); - }else{ + } else { withoutAuthTaskIdList.add(processTaskVo); } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java index 821553cca7629c3c7bbac539c6c1a21d91cb6660..b8cf3321297d65df4bfa2a2e4a601c0a62b3a4b2 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchHideProcessTaskApi.java @@ -45,9 +45,10 @@ public class BatchHideProcessTaskApi extends PrivateApiComponentBase { public String getName() { return "nmpap.batchhideprocesstaskapi.getname"; } + @Input({ @Param(name = "processTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, minSize = 1, desc = "term.itsm.processtaskidlist"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source") + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) @Description(desc = "nmpap.batchhideprocesstaskapi.getname") diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java index 2426b7145de31147717eec192190e743aab5b506..19ff6148215b68456ef5d7bb64a03db4272c505a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchPauseProcessTaskApi.java @@ -46,10 +46,11 @@ public class BatchPauseProcessTaskApi extends PrivateApiComponentBase { public String getName() { return "nmpap.batchpauseprocesstaskapi.getname"; } + @Input({ @Param(name = "processTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, minSize = 1, desc = "term.itsm.processtaskidlist"), @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source") + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) @Description(desc = "nmpap.batchpauseprocesstaskapi.getname") @@ -67,7 +68,7 @@ public class BatchPauseProcessTaskApi extends PrivateApiComponentBase { for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { if (Objects.equals(processTaskStepVo.getStatus(), ProcessTaskStepStatus.RUNNING.getValue())) { IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); - if(handler == null) { + if (handler == null) { throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); } processTaskStepVo.getParamObj().put("source", source); diff --git a/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java b/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java index 255148f1488cf59bceb9a64bd5ce233e0b448d31..f6bf9ae165651095ed85a3ddd065bbdc60bd4424 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/BatchUrgeProcessTaskApi.java @@ -59,7 +59,7 @@ public class BatchUrgeProcessTaskApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, minSize = 1, desc = "term.itsm.processtaskidlist"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source") + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) @Description(desc = "nmpap.batchurgeprocesstaskapi.getname") @@ -84,7 +84,7 @@ public class BatchUrgeProcessTaskApi extends PrivateApiComponentBase { for (String userUuid : fromUserUUidList) { processTaskStepList.addAll(processTaskService.getUrgeableStepList(processTaskVo, userUuid)); } - for(ProcessTaskStepVo processTaskStepVo : processTaskStepList) { + for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { /** 触发通知 **/ processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepNotifyTriggerType.URGE); processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepNotifyTriggerType.URGE); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAbortApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAbortApi.java index 0fef67dc5b5f3e1faea3cac7fc61fe99223ed379..068d71a09592757afc37a4ffafe540e4cf578446 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAbortApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAbortApi.java @@ -18,39 +18,39 @@ import org.springframework.stereotype.Service; @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskAbortApi extends PrivateApiComponentBase { - @Autowired - private ProcessTaskService processTaskService; - - @Override - public String getToken() { - return "processtask/abort"; - } - - @Override - public String getName() { - return "工单取消接口"; - } - - @Override - public String getConfig() { - return null; - } - - @Override - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "工单Id", isRequired = true), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") - }) - @Output({}) - @Description(desc = "工单取消接口") - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); - ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); - processTaskVo.getParamObj().put("source", jsonObj.getString("source")); - processTaskVo.getParamObj().put("content", jsonObj.getString("content")); - ProcessStepHandlerFactory.getHandler().abortProcessTask(processTaskVo); - return null; - } + @Autowired + private ProcessTaskService processTaskService; + + @Override + public String getToken() { + return "processtask/abort"; + } + + @Override + public String getName() { + return "nfpnc.processtasknotifytriggertype.text.abortprocesstask"; + } + + @Override + public String getConfig() { + return null; + } + + @Override + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid", isRequired = true), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") + }) + @Output({}) + @Description(desc = "nfpnc.processtasknotifytriggertype.text.abortprocesstask") + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); + processTaskVo.getParamObj().put("source", jsonObj.getString("source")); + processTaskVo.getParamObj().put("content", jsonObj.getString("content")); + ProcessStepHandlerFactory.getHandler().abortProcessTask(processTaskVo); + return null; + } } 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 4bc490719eb3d6edbc23317c9157507a13024527..74a17b049d7eaf3abc89c1e34ddd29ef6fec83f9 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskAutomaticCompleteApi.java @@ -23,70 +23,71 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; + @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskAutomaticCompleteApi extends PrivateApiComponentBase { - @Resource - private ProcessTaskMapper processTaskMapper; + @Resource + private ProcessTaskMapper processTaskMapper; + + @Override + public String getToken() { + return "processtask/automatic/complete"; + } + + @Override + public String getName() { + return "nmpap.processtaskautomaticcompleteapi.getname"; + } + + @Override + public String getConfig() { + return null; + } - @Override - public String getToken() { - return "processtask/automatic/complete"; - } + @Input({ + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "action", type = ApiParamType.ENUM, rule = "back,complete", isRequired = true, desc = "common.actiontype", help = "complete：流转,back：回退"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") + }) + @Output({ + @Param(name = "Status", type = ApiParamType.STRING, desc = "common.status"), + @Param(name = "Message", type = ApiParamType.STRING, desc = "common.errormsg"), + }) + @Description(desc = "nmpap.processtaskautomaticcompleteapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskStepId = jsonObj.getLong("processTaskStepId"); + String action = jsonObj.getString("action"); + String flowDirection = ProcessFlowDirection.FORWARD.getValue(); + ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId); + if (processTaskStepVo == null) { + throw new ProcessTaskStepNotFoundException(processTaskStepId.toString()); + } + if (!ProcessStepHandlerType.AUTOMATIC.getHandler().equals(processTaskStepVo.getHandler())) { + throw new ProcessTaskStepMustBeAutomaticException(); + } + jsonObj.put("processTaskId", processTaskStepVo.getProcessTaskId()); + if (action.equals(ProcessTaskStepOperationType.STEP_BACK.getValue())) { + flowDirection = ProcessFlowDirection.BACKWARD.getValue(); + } + /* 不允许多个后续步骤 **/ + List processTaskStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(processTaskStepId, flowDirection); + if (CollectionUtils.isEmpty(processTaskStepIdList) || (CollectionUtils.isNotEmpty(processTaskStepIdList) && processTaskStepIdList.size() > 1)) { + throw new ProcessTaskAutomaticNotAllowNextStepsException(); + } - @Override - public String getName() { - return "流转自动化处理步骤"; - } + IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); + if (handler != null) { + jsonObj.put("nextStepId", processTaskStepIdList.get(0)); + processTaskStepVo.getParamObj().putAll(jsonObj); + handler.autoComplete(processTaskStepVo); + } else { + throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); + } + return null; + } - @Override - public String getConfig() { - return null; - } - - @Input({ - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "当前步骤Id"), - @Param(name = "action", type = ApiParamType.ENUM, rule = "back,complete", isRequired = true, desc = "操作类型，complete：流转,back：回退"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") - }) - @Output({ - @Param(name = "Status", type = ApiParamType.STRING, desc = "状态"), - @Param(name = "Message", type = ApiParamType.STRING, desc = "异常信息"), - }) - @Description(desc = "流转自动化处理步骤") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskStepId = jsonObj.getLong("processTaskStepId"); - String action = jsonObj.getString("action"); - String flowDirection = ProcessFlowDirection.FORWARD.getValue(); - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(processTaskStepId); - if(processTaskStepVo == null) { - throw new ProcessTaskStepNotFoundException(processTaskStepId.toString()); - } - if(!ProcessStepHandlerType.AUTOMATIC.getHandler().equals(processTaskStepVo.getHandler())) { - throw new ProcessTaskStepMustBeAutomaticException(); - } - jsonObj.put("processTaskId", processTaskStepVo.getProcessTaskId()); - if(action.equals(ProcessTaskStepOperationType.STEP_BACK.getValue())) { - flowDirection = ProcessFlowDirection.BACKWARD.getValue(); - } - /* 不允许多个后续步骤 **/ - List processTaskStepIdList = processTaskMapper.getToProcessTaskStepIdListByFromIdAndType(processTaskStepId, flowDirection); - if(CollectionUtils.isEmpty(processTaskStepIdList)||(CollectionUtils.isNotEmpty(processTaskStepIdList) && processTaskStepIdList.size()>1)) { - throw new ProcessTaskAutomaticNotAllowNextStepsException(); - } - - IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); - if(handler != null) { - jsonObj.put("nextStepId", processTaskStepIdList.get(0)); - processTaskStepVo.getParamObj().putAll(jsonObj); - handler.autoComplete(processTaskStepVo); - }else { - throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); - } - return null; - } - } 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 3d676656ede39f6b3a34f77ad12a7beeaa70a875..545b4aff025857e6b7488a5605137358567909fd 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentApi.java @@ -65,7 +65,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP @Override public String getName() { - return "工单回复接口"; + return "nmpap.processtaskcommentapi.getname"; } @Override @@ -73,21 +73,24 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP return null; } - @Input({@Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "步骤id"), - @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "附件id列表"), - @Param(name = "commentTemplateId", type = ApiParamType.LONG, desc = "回复模版ID")}) - @Output({@Param(name = "commentList", explode = ProcessTaskStepReplyVo[].class, desc = "当前步骤评论列表")}) - @Description(desc = "工单回复接口") + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "common.fileidlist"), + @Param(name = "commentTemplateId", type = ApiParamType.LONG, desc = "common.templateid")}) + @Output({ + @Param(name = "commentList", explode = ProcessTaskStepReplyVo[].class, desc = "common.tbodylist") + }) + @Description(desc = "nmpap.processtaskcommentapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); Long processTaskStepId = jsonObj.getLong("processTaskStepId"); Long commentTemplateId = jsonObj.getLong("commentTemplateId"); ProcessTaskVo processTaskVo = - processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); + processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); processTaskMapper.getProcessTaskLockById(processTaskId); ProcessTaskStepVo processTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); new ProcessAuthManager.StepOperationChecker(processTaskStepId, ProcessTaskStepOperationType.STEP_COMMENT) @@ -100,7 +103,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP processTaskStepDataVo.setFcu(UserContext.get().getUserUuid(true)); processTaskStepDataVo.setType(ProcessTaskStepDataType.STEPDRAFTSAVE.getValue()); ProcessTaskStepDataVo stepDraftSaveData = - processTaskStepDataMapper.getProcessTaskStepData(processTaskStepDataVo); + processTaskStepDataMapper.getProcessTaskStepData(processTaskStepDataVo); if (stepDraftSaveData != null) { JSONObject dataObj = stepDraftSaveData.getData(); if (MapUtils.isNotEmpty(dataObj)) { @@ -152,7 +155,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP /** 记录回复模版使用次数 */ if (commentTemplateId != null) { ProcessCommentTemplateUseCountVo templateUseCount = - commentTemplateMapper.getTemplateUseCount(commentTemplateId, UserContext.get().getUserUuid()); + commentTemplateMapper.getTemplateUseCount(commentTemplateId, UserContext.get().getUserUuid()); if (templateUseCount != null) { commentTemplateMapper.updateTemplateUseCount(commentTemplateId, UserContext.get().getUserUuid()); } else { @@ -175,7 +178,7 @@ public class ProcessTaskCommentApi extends PrivateApiComponentBase implements IP typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_START.getValue()); resultObj.put("commentList", - processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepId, typeList)); + processTaskService.getProcessTaskStepReplyListByProcessTaskStepId(processTaskStepId, typeList)); return resultObj; } 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 7b7f10fbe8330a35b992eef438ee01f5c04acf66..11c04abd01f2e7651820d4aee3195a003832f368 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentDeleteApi.java @@ -27,59 +27,60 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; import java.util.Objects; + @Service @Transactional @OperationType(type = OperationTypeEnum.DELETE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskCommentDeleteApi extends PrivateApiComponentBase { - @Autowired - private ProcessTaskMapper processTaskMapper; - - @Autowired - private ProcessTaskService processTaskService; + @Autowired + private ProcessTaskMapper processTaskMapper; + + @Autowired + private ProcessTaskService processTaskService; - @Autowired - private IProcessStepHandlerUtil processStepHandlerUtil; + @Autowired + private IProcessStepHandlerUtil processStepHandlerUtil; - @Override - public String getToken() { - return "processtask/comment/delete"; - } + @Override + public String getToken() { + return "processtask/comment/delete"; + } - @Override - public String getName() { - return "工单回复删除接口"; - } + @Override + public String getName() { + return "nmpap.processtaskcommentdeleteapi.getname"; + } - @Override - public String getConfig() { - return null; - } + @Override + public String getConfig() { + return null; + } - @Input({ - @Param(name = "id", type = ApiParamType.LONG, isRequired = true, desc = "回复id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") - }) - @Output({ - @Param(name = "commentList", explode = ProcessTaskStepReplyVo[].class, desc = "当前步骤评论列表") - }) - @Description(desc = "工单回复删除接口") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - Long id = jsonObj.getLong("id"); - ProcessTaskStepContentVo processTaskStepContentVo= processTaskMapper.getProcessTaskStepContentById(id); - if(processTaskStepContentVo == null) { - throw new ProcessTaskStepCommentNotFoundException(id.toString()); - } - ProcessTaskStepReplyVo replyVo = new ProcessTaskStepReplyVo(processTaskStepContentVo); - if(Objects.equals(replyVo.getIsDeletable(), 0)) { + @Input({ + @Param(name = "id", type = ApiParamType.LONG, isRequired = true, desc = "common.id"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") + }) + @Output({ + @Param(name = "commentList", explode = ProcessTaskStepReplyVo[].class, desc = "common.tbodylist") + }) + @Description(desc = "nmpap.processtaskcommentdeleteapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + Long id = jsonObj.getLong("id"); + ProcessTaskStepContentVo processTaskStepContentVo = processTaskMapper.getProcessTaskStepContentById(id); + if (processTaskStepContentVo == null) { + throw new ProcessTaskStepCommentNotFoundException(id.toString()); + } + ProcessTaskStepReplyVo replyVo = new ProcessTaskStepReplyVo(processTaskStepContentVo); + if (Objects.equals(replyVo.getIsDeletable(), 0)) { // throw new ProcessTaskNoPermissionException(ProcessTaskOperationType.DELETECOMMENT.getText()); - throw new PermissionDeniedException(); - } - // 锁定当前流程 + throw new PermissionDeniedException(); + } + // 锁定当前流程 processTaskMapper.getProcessTaskLockById(replyVo.getProcessTaskId()); - + processTaskService.parseProcessTaskStepReply(replyVo); jsonObj.put(ProcessTaskAuditDetailType.CONTENT.getParamName(), replyVo.getContent()); jsonObj.put(ProcessTaskAuditDetailType.FILE.getParamName(), JSON.toJSONString(replyVo.getFileIdList())); @@ -87,10 +88,10 @@ public class ProcessTaskCommentDeleteApi extends PrivateApiComponentBase { processTaskMapper.deleteProcessTaskStepContentById(id); processTaskMapper.deleteProcessTaskStepFileByContentId(id); //生成活动 - ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(replyVo.getProcessTaskStepId()); + ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(replyVo.getProcessTaskStepId()); processTaskStepVo.getParamObj().putAll(jsonObj); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETECOMMENT); - + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETECOMMENT); + JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); @@ -98,10 +99,10 @@ public class ProcessTaskCommentDeleteApi extends PrivateApiComponentBase { typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); - typeList.add(ProcessTaskOperationType.PROCESSTASK_START.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 78b5e0d08fddd8ae68faf471d7dd1aed473050a6..0c90b980acc0588c66ee23f7fe84cd49421b1225 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCommentEditApi.java @@ -26,74 +26,75 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; import java.util.Objects; + @Service @Transactional @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskCommentEditApi extends PrivateApiComponentBase { - @Autowired - private ProcessTaskMapper processTaskMapper; - - @Autowired - private ProcessTaskService processTaskService; + @Autowired + private ProcessTaskMapper processTaskMapper; + + @Autowired + private ProcessTaskService processTaskService; - @Autowired - private IProcessStepHandlerUtil processStepHandlerUtil; + @Autowired + private IProcessStepHandlerUtil processStepHandlerUtil; - @Override - public String getToken() { - return "processtask/comment/edit"; - } + @Override + public String getToken() { + return "processtask/comment/edit"; + } - @Override - public String getName() { - return "工单回复编辑接口"; - } + @Override + public String getName() { + return "nmpap.processtaskcommenteditapi.getname"; + } - @Override - public String getConfig() { - return null; - } - - @Input({ - @Param(name = "id", type = ApiParamType.LONG, isRequired = true, desc = "回复id"), - @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "fileIdList", type=ApiParamType.JSONARRAY, desc = "附件id列表") - }) - @Output({ - @Param(name = "commentList", explode = ProcessTaskStepReplyVo[].class, desc = "当前步骤评论列表") - }) - @Description(desc = "工单回复编辑接口") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - String content = jsonObj.getString("content"); - List fileIdList = JSON.parseArray(JSON.toJSONString(jsonObj.getJSONArray("fileIdList")), Long.class); - if(content == null && fileIdList == null){ - return null; - } - Long id = jsonObj.getLong("id"); - ProcessTaskStepContentVo processTaskStepContentVo= processTaskMapper.getProcessTaskStepContentById(id); - if(processTaskStepContentVo == null) { + @Override + public String getConfig() { + return null; + } + + @Input({ + @Param(name = "id", type = ApiParamType.LONG, isRequired = true, desc = "common.id"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "common.fileidlist") + }) + @Output({ + @Param(name = "commentList", explode = ProcessTaskStepReplyVo[].class, desc = "common.tbodylist") + }) + @Description(desc = "nmpap.processtaskcommenteditapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + String content = jsonObj.getString("content"); + List fileIdList = JSON.parseArray(JSON.toJSONString(jsonObj.getJSONArray("fileIdList")), Long.class); + if (content == null && fileIdList == null) { + return null; + } + Long id = jsonObj.getLong("id"); + ProcessTaskStepContentVo processTaskStepContentVo = processTaskMapper.getProcessTaskStepContentById(id); + if (processTaskStepContentVo == null) { throw new ProcessTaskStepCommentNotFoundException(id.toString()); } ProcessTaskStepReplyVo oldReplyVo = new ProcessTaskStepReplyVo(processTaskStepContentVo); - if(Objects.equals(oldReplyVo.getIsEditable(), 0)) { + if (Objects.equals(oldReplyVo.getIsEditable(), 0)) { //throw new ProcessTaskNoPermissionException(ProcessTaskOperationType.EDITCOMMENT.getText()); - throw new PermissionDeniedException(); - } - // 锁定当前流程 + throw new PermissionDeniedException(); + } + // 锁定当前流程 processTaskMapper.getProcessTaskLockById(oldReplyVo.getProcessTaskId()); - + boolean isUpdate = processTaskService.saveProcessTaskStepReply(jsonObj, oldReplyVo); - if(isUpdate) { + if (isUpdate) { //生成活动 ProcessTaskStepVo processTaskStepVo = processTaskMapper.getProcessTaskStepBaseInfoById(oldReplyVo.getProcessTaskStepId()); processTaskStepVo.getParamObj().putAll(jsonObj); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.EDITCOMMENT); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.EDITCOMMENT); } - + JSONObject resultObj = new JSONObject(); List typeList = new ArrayList<>(); typeList.add(ProcessTaskStepOperationType.STEP_COMMENT.getValue()); @@ -101,9 +102,9 @@ public class ProcessTaskCommentEditApi extends PrivateApiComponentBase { typeList.add(ProcessTaskStepOperationType.STEP_BACK.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_RETREAT.getValue()); typeList.add(ProcessTaskOperationType.PROCESSTASK_TRANSFER.getValue()); - typeList.add(ProcessTaskStepOperationType.STEP_REAPPROVAL.getValue()); - typeList.add(ProcessTaskOperationType.PROCESSTASK_START.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/ProcessTaskCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java index 36a03a864d6c607a08ea9f7f50cd77939b326d24..87a80348ba39b7f609382507ec8917898c213e51 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java @@ -55,12 +55,12 @@ public class ProcessTaskCompleteApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "当前步骤Id"), - @Param(name = "nextStepId", type = ApiParamType.LONG, desc = "激活下一步骤Id（如果有且仅有一个下一节点，则可以不传这个参数）"), - @Param(name = "action", type = ApiParamType.ENUM, rule = "complete,back", isRequired = true, desc = "操作类型"), - @Param(name = "content", type = ApiParamType.STRING, desc = "原因"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "assignWorkerList", type = ApiParamType.JSONARRAY, desc = "分配步骤处理人信息列表，格式[{\"processTaskStepId\":1, \"workerList\":[\"user#xxx\",\"team#xxx\",\"role#xxx\"]}]") + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "nextStepId", type = ApiParamType.LONG, desc = "term.itsm.processtasknextstepid", help = "如果有且仅有一个下一节点，则可以不传这个参数"), + @Param(name = "action", type = ApiParamType.ENUM, rule = "complete,back", isRequired = true, desc = "common.actiontype"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "assignWorkerList", type = ApiParamType.JSONARRAY, desc = "term.itsm.assignworkerlist", help = "格式为[{\"processTaskStepId\":1, \"workerList\":[\"user#xxx\",\"team#xxx\",\"role#xxx\"]}]") }) @Description(desc = "nmpap.processtaskcompleteapi.getname") @Override diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java index 5df71fc5925484f28d0117cf10b41deba2d5bdef..81fd851b523791facec5a07d84de70ceff562055 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java @@ -78,7 +78,7 @@ public class ProcessTaskDraftSaveApi extends PrivateApiComponentBase { @Param(name = "handlerStepInfo", type = ApiParamType.JSONOBJECT, desc = "term.itsm.handlerstepinfo"), @Param(name = "fromProcessTaskId", type = ApiParamType.LONG, desc = "term.itsm.fromprocesstaskid", help = "从转报进入上报页时，传fromProcessTaskId"), @Param(name = "channelTypeRelationId", type = ApiParamType.LONG, desc = "term.itsm.channeltyperelationid", help = "从转报进入上报页时，传channelTypeRelationId"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), @Param(name = "parentProcessTaskStepId", type = ApiParamType.LONG, desc = "nmpap.processtaskdraftgetapi.input.param.desc.parentprocesstaskstepid", help = "创建子流程时，传parentProcessTaskStepId"), @Param(name = "invoke", type = ApiParamType.STRING, desc = "nmpap.processtaskdraftsaveapi.input.param.desc.invoke", help = "subprocess :子流程"), @Param(name = "regionId", type = ApiParamType.LONG, desc = "nmtar.searchregionteamapi.input.param.desc.regionid") diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java index 93bfddb6af813169285685cb6abeba8de6672a9e..64897e7c0956ce49d27d691bb35d4b0f7f8c6037 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUpdateApi.java @@ -23,58 +23,60 @@ import javax.annotation.Resource; @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskFocusUpdateApi extends PrivateApiComponentBase { - @Resource - private ProcessTaskMapper processTaskMapper; + @Resource + private ProcessTaskMapper processTaskMapper; - @Resource - private IProcessStepHandlerUtil processStepHandlerUtil; + @Resource + private IProcessStepHandlerUtil processStepHandlerUtil; - @Override - public String getToken() { - return "processtask/focus/update"; - } + @Override + public String getToken() { + return "processtask/focus/update"; + } - @Override - public String getName() { - return "切换工单关注状态"; - } + @Override + public String getName() { + return "nmpap.processtaskfocusupdateapi.getname"; + } - @Override - public String getConfig() { - return null; - } + @Override + public String getConfig() { + return null; + } - @Override - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "工单Id", isRequired = true), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "isFocus", type = ApiParamType.ENUM, desc = "是否关注工单(1：关注；0：取消关注)", isRequired = true,rule = "0,1") - }) - @Output({@Param(name="isFocus", type = ApiParamType.INTEGER, desc="是否关注工单")}) - @Description(desc = "切换工单关注状态") - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); - int isFocus = jsonObj.getIntValue("isFocus"); - String userUuid = UserContext.get().getUserUuid(); - if(processTaskMapper.getProcessTaskById(processTaskId) == null){ - throw new ProcessTaskNotFoundException(processTaskId); - } - ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); - processTaskStepVo.setProcessTaskId(processTaskId); - processTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); - if(isFocus == 1){ - if(processTaskMapper.checkProcessTaskFocusExists(processTaskId,userUuid) > 0){ - throw new ProcessTaskFocusRepeatException(processTaskId); - } - processTaskMapper.insertProcessTaskFocus(processTaskId,userUuid); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.FOCUSTASK); - }else{ - processTaskMapper.deleteProcessTaskFocus(processTaskId,userUuid); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UNDOFOCUSTASK); - } - JSONObject result = new JSONObject(); - result.put("isFocus",isFocus); - return result; - } + @Override + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid", isRequired = true), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "isFocus", type = ApiParamType.ENUM, desc = "term.itsm.isfocus", isRequired = true, rule = "0,1", help = "1：关注；0：取消关注") + }) + @Output({ + @Param(name = "isFocus", type = ApiParamType.INTEGER, desc = "term.itsm.isfocus") + }) + @Description(desc = "nmpap.processtaskfocusupdateapi.getname") + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + int isFocus = jsonObj.getIntValue("isFocus"); + String userUuid = UserContext.get().getUserUuid(); + if (processTaskMapper.getProcessTaskById(processTaskId) == null) { + throw new ProcessTaskNotFoundException(processTaskId); + } + ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); + processTaskStepVo.setProcessTaskId(processTaskId); + processTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); + if (isFocus == 1) { + if (processTaskMapper.checkProcessTaskFocusExists(processTaskId, userUuid) > 0) { + throw new ProcessTaskFocusRepeatException(processTaskId); + } + processTaskMapper.insertProcessTaskFocus(processTaskId, userUuid); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.FOCUSTASK); + } else { + processTaskMapper.deleteProcessTaskFocus(processTaskId, userUuid); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UNDOFOCUSTASK); + } + JSONObject result = new JSONObject(); + result.put("isFocus", isFocus); + return result; + } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java index 8d37c2425d279af5def41e9a0c79bd1f3e048d11..86393800aeaaae635793231b866de6aadcb864ee 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskFocusUserUpdateApi.java @@ -49,7 +49,7 @@ public class ProcessTaskFocusUserUpdateApi extends PrivateApiComponentBase { @Override public String getName() { - return "更新工单关注人"; + return "nmpap.processtaskfocususerupdateapi.getname"; } @Override @@ -58,11 +58,11 @@ public class ProcessTaskFocusUserUpdateApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "focusUserUuidList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "工单关注人列表") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "focusUserUuidList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.focususeruuidlist") }) - @Description(desc = "更新工单关注人") + @Description(desc = "nmpap.processtaskfocususerupdateapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); @@ -73,9 +73,9 @@ public class ProcessTaskFocusUserUpdateApi extends PrivateApiComponentBase { .checkAndNoPermissionThrowException(); List oldFocusUser = processTaskMapper.getFocusUserListByTaskId(processTaskId); JSONObject paramObj = new JSONObject(); - paramObj.put("focusUserUuidList",focusUserUuidList); + paramObj.put("focusUserUuidList", focusUserUuidList); paramObj.put(ProcessTaskAuditDetailType.FOCUSUSER.getOldDataParamName(), JSON.toJSONString(oldFocusUser)); - paramObj.put("source",jsonObj.getString("source")); + paramObj.put("source", jsonObj.getString("source")); ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(processTaskVo.getId()); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java index 396051f5036fa31f15dd5301e2a5bc51a4be1f16..d7cc663ad3cb089477b9add011d5c0c1a77dabc3 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskReapprovalApi.java @@ -68,7 +68,7 @@ public class ProcessTaskReapprovalApi extends PrivateApiComponentBase { @Override public String getName() { - return "工单步骤重审接口"; + return "nmpap.processtaskreapprovalapi.getname"; } @Override @@ -77,11 +77,11 @@ public class ProcessTaskReapprovalApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "步骤id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) - @Description(desc = "工单步骤重审接口") + @Description(desc = "nmpap.processtaskreapprovalapi.getname") @Override public Object myDoService(JSONObject paramObj) throws Exception { Long processTaskId = paramObj.getLong("processTaskId"); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRecoverApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRecoverApi.java index 784ef98d313dd32eca0fe3cb99010bce9fb04eed..84c96f915884637e79196f57b33547b0338897f0 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRecoverApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRecoverApi.java @@ -18,39 +18,39 @@ import org.springframework.stereotype.Service; @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskRecoverApi extends PrivateApiComponentBase { - @Autowired - private ProcessTaskService processTaskService; - - @Override - public String getToken() { - return "processtask/recover"; - } - - @Override - public String getName() { - return "工单恢复接口"; - } - - @Override - public String getConfig() { - return null; - } - - @Override - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单Id"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") - }) - @Output({}) - @Description(desc = "工单恢复接口") - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); - ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); - processTaskVo.getParamObj().put("source", jsonObj.getString("source")); - processTaskVo.getParamObj().put("content", jsonObj.getString("content")); - ProcessStepHandlerFactory.getHandler().recoverProcessTask(processTaskVo); - return null; - } + @Autowired + private ProcessTaskService processTaskService; + + @Override + public String getToken() { + return "processtask/recover"; + } + + @Override + public String getName() { + return "nfpnc.processtasknotifytriggertype.text.recoverprocesstask"; + } + + @Override + public String getConfig() { + return null; + } + + @Override + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") + }) + @Output({}) + @Description(desc = "nfpnc.processtasknotifytriggertype.text.recoverprocesstask") + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); + processTaskVo.getParamObj().put("source", jsonObj.getString("source")); + processTaskVo.getParamObj().put("content", jsonObj.getString("content")); + ProcessStepHandlerFactory.getHandler().recoverProcessTask(processTaskVo); + return null; + } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java index dadae83e76ba3aa937a5ded21199412f4bebaeb7..f35cc58f252e04aea294e87f4257b092a2ee5a73 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationDeleteApi.java @@ -45,7 +45,7 @@ public class ProcessTaskRelationDeleteApi extends PrivateApiComponentBase { @Override public String getName() { - return "删除工单关联"; + return "nmpap.processtaskrelationdeleteapi.getname"; } @Override @@ -54,18 +54,18 @@ public class ProcessTaskRelationDeleteApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "processTaskRelationId", type = ApiParamType.LONG, isRequired = true, desc = "工单关联id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "processTaskRelationId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskrelationid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) - @Description(desc = "删除工单关联") + @Description(desc = "nmpap.processtaskrelationdeleteapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskRelationId = jsonObj.getLong("processTaskRelationId"); ProcessTaskRelationVo processTaskRelationVo = - processTaskMapper.getProcessTaskRelationById(processTaskRelationId); + processTaskMapper.getProcessTaskRelationById(processTaskRelationId); if (processTaskRelationVo != null) { ProcessTaskVo processTaskVo = - processTaskMapper.getProcessTaskBaseInfoById(processTaskRelationVo.getSource()); + processTaskMapper.getProcessTaskBaseInfoById(processTaskRelationVo.getSource()); new ProcessAuthManager.TaskOperationChecker(processTaskVo.getId(), ProcessTaskOperationType.PROCESSTASK_TRANSFERREPORT).build().checkAndNoPermissionThrowException(); processTaskMapper.deleteProcessTaskRelationById(processTaskRelationId); @@ -73,18 +73,18 @@ public class ProcessTaskRelationDeleteApi extends PrivateApiComponentBase { ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); processTaskStepVo.setProcessTaskId(processTaskRelationVo.getSource()); processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), - processTaskRelationVo.getChannelTypeRelationId()); + processTaskRelationVo.getChannelTypeRelationId()); processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), - JSON.toJSONString(Arrays.asList(processTaskRelationVo.getTarget()))); + JSON.toJSONString(Arrays.asList(processTaskRelationVo.getTarget()))); processTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.DELETERELATION); ProcessTaskStepVo processTaskStep = new ProcessTaskStepVo(); processTaskStep.setProcessTaskId(processTaskRelationVo.getTarget()); processTaskStep.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), - processTaskRelationVo.getChannelTypeRelationId()); + processTaskRelationVo.getChannelTypeRelationId()); processTaskStep.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), - JSON.toJSONString(Arrays.asList(processTaskRelationVo.getSource()))); + JSON.toJSONString(Arrays.asList(processTaskRelationVo.getSource()))); processTaskStep.getParamObj().put("source", jsonObj.getString("source")); processStepHandlerUtil.audit(processTaskStep, ProcessTaskAuditType.DELETERELATION); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java index 39796f02a2fcb0ad27dcc1db2a895d397accde1c..065efb402ffaae046223b708e02df216dfd01e77 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java @@ -47,7 +47,7 @@ public class ProcessTaskRelationSaveApi extends PrivateApiComponentBase implemen @Override public String getName() { - return "保存工单关联"; + return "nmpap.processtaskrelationsaveapi.getname"; } @Override @@ -56,12 +56,12 @@ public class ProcessTaskRelationSaveApi extends PrivateApiComponentBase implemen } @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "channelTypeRelationId", type = ApiParamType.LONG, isRequired = true, desc = "服务类型关系id"), - @Param(name = "relationProcessTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "被关联的工单id列表"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "channelTypeRelationId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.channeltyperelationid"), + @Param(name = "relationProcessTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.relationprocesstaskidlist"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), }) - @Description(desc = "保存工单关联") + @Description(desc = "nmpap.processtaskrelationsaveapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); @@ -74,7 +74,7 @@ public class ProcessTaskRelationSaveApi extends PrivateApiComponentBase implemen throw new ChannelTypeRelationNotFoundException(channelTypeRelationId); } List relationProcessTaskIdList = - JSON.parseArray(JSON.toJSONString(jsonObj.getJSONArray("relationProcessTaskIdList")), Long.class); + JSON.parseArray(JSON.toJSONString(jsonObj.getJSONArray("relationProcessTaskIdList")), Long.class); if (CollectionUtils.isNotEmpty(relationProcessTaskIdList)) { List processTaskIdList = processTaskMapper.checkProcessTaskIdListIsExists(relationProcessTaskIdList); if (CollectionUtils.isNotEmpty(processTaskIdList)) { diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java index 6f0fdbc980213528a2c7c14792de96688f5391a2..a7e93293c119745377c6dfd9ac4c03bd7a42b65c 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatDeleteApi.java @@ -72,7 +72,7 @@ public class ProcessTaskRepeatDeleteApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), @Param(name = "repeatProcessTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.repeatprocesstaskid"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), }) @Description(desc = "nmpap.processtaskrepeatdeleteapi.getname") @Override diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java index 8421204590231b52d25b6524539920b3b38459af..d692a8a3c4c7546fb49d44b0387b5a290cee1e80 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRepeatSaveApi.java @@ -82,7 +82,7 @@ public class ProcessTaskRepeatSaveApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), @Param(name = "repeatProcessTaskIdList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.repeatprocesstaskidlist") }) @Output({ diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatApi.java index 0352f31802cf0d10c0844710e5e624c2d274c479..2115ce3d5336fac67e97f33e0049ffa7bd5cf59f 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRetreatApi.java @@ -1,14 +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.exception.type.PermissionDeniedException; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.crossover.IProcessTaskRetreatApiCrossoverService; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; import neatlogic.framework.process.exception.process.ProcessStepHandlerNotFoundException; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.restful.annotation.Description; @@ -18,52 +17,52 @@ import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskRetreatApi extends PrivateApiComponentBase implements IProcessTaskRetreatApiCrossoverService { - + @Autowired private ProcessTaskService processTaskService; - - @Override - public String getToken() { - return "processtask/retreat"; - } - @Override - public String getName() { - return "上一步发起的撤回动作接口"; - } + @Override + public String getToken() { + return "processtask/retreat"; + } + + @Override + public String getName() { + return "nmpap.processtaskretreatapi.getname"; + } - @Override - public String getConfig() { - return null; - } + @Override + public String getConfig() { + return null; + } - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "步骤id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "描述") - }) - @Description(desc = "上一步发起的撤回动作接口") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content") + }) + @Description(desc = "nmpap.processtaskretreatapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); Long processTaskStepId = jsonObj.getLong("processTaskStepId"); ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); - ProcessTaskStepVo processTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); - IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); - if(handler == null) { + ProcessTaskStepVo processTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); + IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(processTaskStepVo.getHandler()); + if (handler == null) { throw new ProcessStepHandlerNotFoundException(processTaskStepVo.getHandler()); - } + } processTaskStepVo.getParamObj().putAll(jsonObj); - handler.retreat(processTaskStepVo); - return null; - } + handler.retreat(processTaskStepVo); + return null; + } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskScoreApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskScoreApi.java index d43e6b3e12e2c44c1f325745ed113986d2d21746..1a6edc6069d77eae132cfd27b26053d0e8c2d7fb 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskScoreApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskScoreApi.java @@ -1,17 +1,15 @@ 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.framework.process.dto.ProcessTaskVo; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; 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 com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,41 +18,40 @@ import org.springframework.stereotype.Service; @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskScoreApi extends PrivateApiComponentBase { - @Autowired - private ProcessTaskService processTaskService; - - @Override - public String getToken() { - return "processtask/score"; - } - - @Override - public String getName() { - return "工单评分接口"; - } - - @Override - public String getConfig() { - return null; - } - - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "scoreTemplateId", type = ApiParamType.LONG, isRequired = true, desc = "评分模版ID"), - @Param(name = "scoreDimensionList", type = ApiParamType.JSONARRAY, isRequired = true, - desc = "评分维度及分数，格式[{\"id\":133018403841111,\"name\":\"dim\",\"description\":\"see\",\"score\":3}]"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "content", type = ApiParamType.STRING, desc = "评价内容") - }) - @Output({}) - @Description(desc = "工单评分接口") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); - ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); - processTaskVo.setParamObj(jsonObj); - ProcessStepHandlerFactory.getHandler().scoreProcessTask(processTaskVo); - return null; - } + @Autowired + private ProcessTaskService processTaskService; + + @Override + public String getToken() { + return "processtask/score"; + } + + @Override + public String getName() { + return "nmpap.processtaskscoreapi.getname"; + } + + @Override + public String getConfig() { + return null; + } + + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "scoreTemplateId", type = ApiParamType.LONG, isRequired = true, desc = "common.templateid"), + @Param(name = "scoreDimensionList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.scoredimensionlist", help = "格式[{\"id\":133018403841111,\"name\":\"dim\",\"description\":\"see\",\"score\":3}]"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content") + }) + @Output({}) + @Description(desc = "nmpap.processtaskscoreapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); + processTaskVo.setParamObj(jsonObj); + ProcessStepHandlerFactory.getHandler().scoreProcessTask(processTaskVo); + return null; + } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartApi.java index bdfeed83d04ad87d810d26015f7a17495cd6b03f..6021ec097f42b356ab1d42ef55a4ee7f8e9822c3 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartApi.java @@ -42,7 +42,7 @@ public class ProcessTaskStartApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), @Param(name = "action", type = ApiParamType.ENUM, rule = "accept,start", isRequired = true, desc = "common.actiontype") }) @Description(desc = "nmpap.processtaskstartapi.getname") diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java index 1b76d2ad975f8c77116a6ecc37dabc255978d210..493f538e469d499b9ce1f0fe08fbe3127e2569f9 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartProcessApi.java @@ -31,7 +31,7 @@ public class ProcessTaskStartProcessApi extends PrivateApiComponentBase { @Override public String getName() { - return "工单上报提交接口"; + return "nmpap.processtaskstartprocessapi.getname"; } @Override @@ -40,12 +40,12 @@ public class ProcessTaskStartProcessApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单Id"), - @Param(name = "nextStepId", type = ApiParamType.LONG, desc = "激活下一步骤Id（如果有且仅有一个下一节点，则可以不传这个参数）"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "assignWorkerList", type = ApiParamType.JSONARRAY, desc = "分配步骤处理人信息列表，格式[{\"processTaskStepId\":1, \"processStepUuid\":\"abc\", \"workerList\":[\"user#xxx\",\"team#xxx\",\"role#xxx\"]}]") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "nextStepId", type = ApiParamType.LONG, desc = "term.itsm.processtasknextstepid", help = "如果有且仅有一个下一节点，则可以不传这个参数"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "assignWorkerList", type = ApiParamType.JSONARRAY, desc = "term.itsm.assignworkerlist", help = "格式[{\"processTaskStepId\":1, \"processStepUuid\":\"abc\", \"workerList\":[\"user#xxx\",\"team#xxx\",\"role#xxx\"]}]") }) - @Description(desc = "工单上报提交接口") + @Description(desc = "nmpap.processtaskstartprocessapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { // Long processTaskId = jsonObj.getLong("processTaskId"); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepPauseApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepPauseApi.java index a7573aae990f4f9fc22857b8b15970b1540478e1..e91199cc74e8ad4519150c4d11f44cc0637d9714 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepPauseApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepPauseApi.java @@ -18,6 +18,7 @@ import neatlogic.module.process.service.ProcessTaskService; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) @@ -33,29 +34,30 @@ public class ProcessTaskStepPauseApi extends PrivateApiComponentBase { @Override public String getName() { - return "暂停工单步骤"; + return "nmpap.processtasksteppauseapi.getname"; } @Override public String getConfig() { return null; } + @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "工单步骤id"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) - @Description(desc ="暂停工单步骤") + @Description(desc = "nmpap.processtasksteppauseapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); - Long processTaskStepId = jsonObj.getLong("processTaskStepId"); + Long processTaskStepId = jsonObj.getLong("processTaskStepId"); ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); ProcessTaskStepVo currentProcessTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); - if(handler == null) { - throw new ProcessStepHandlerNotFoundException(currentProcessTaskStepVo.getHandler()); + if (handler == null) { + throw new ProcessStepHandlerNotFoundException(currentProcessTaskStepVo.getHandler()); } currentProcessTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); currentProcessTaskStepVo.getParamObj().put("content", jsonObj.getString("content")); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRecoverApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRecoverApi.java index e33fa6e9f14a6b8db098fc9d76720694bd480ec7..db2fa6bd70a251297ef052c63ea0ff5eb302809b 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRecoverApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRecoverApi.java @@ -18,6 +18,7 @@ import neatlogic.module.process.service.ProcessTaskService; import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) @@ -33,30 +34,30 @@ public class ProcessTaskStepRecoverApi extends PrivateApiComponentBase { @Override public String getName() { - return "恢复工单步骤"; + return "nmpap.processtasksteprecoverapi.getname"; } @Override public String getConfig() { return null; } - + @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "工单步骤id"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) - @Description(desc ="恢复工单步骤") + @Description(desc = "nmpap.processtasksteprecoverapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); - Long processTaskStepId = jsonObj.getLong("processTaskStepId"); + Long processTaskStepId = jsonObj.getLong("processTaskStepId"); ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId, processTaskStepId); ProcessTaskStepVo currentProcessTaskStepVo = processTaskVo.getCurrentProcessTaskStep(); IProcessStepHandler handler = ProcessStepHandlerFactory.getHandler(currentProcessTaskStepVo.getHandler()); - if(handler == null) { - throw new ProcessStepHandlerNotFoundException(currentProcessTaskStepVo.getHandler()); + if (handler == null) { + throw new ProcessStepHandlerNotFoundException(currentProcessTaskStepVo.getHandler()); } currentProcessTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); currentProcessTaskStepVo.getParamObj().put("content", jsonObj.getString("content")); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRedoApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRedoApi.java index 7748d2480f19b9896ef6ee86e6e9e3e6eb1b5539..4e7917ce16c0b20ee05f34201aa5ee552a2db86a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRedoApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepRedoApi.java @@ -1,12 +1,11 @@ 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.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.ProcessTaskVo; -import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.stephandler.core.IProcessStepHandler; import neatlogic.framework.process.stephandler.core.ProcessStepHandlerFactory; import neatlogic.framework.restful.annotation.Description; @@ -16,14 +15,14 @@ import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskStepRedoApi extends PrivateApiComponentBase { - + @Autowired private ProcessTaskService processTaskService; @@ -34,7 +33,7 @@ public class ProcessTaskStepRedoApi extends PrivateApiComponentBase { @Override public String getName() { - return "打回重做步骤"; + return "nmpap.processtaskstepredoapi.getname"; } @Override @@ -43,12 +42,12 @@ public class ProcessTaskStepRedoApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单Id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "激活步骤Id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "原因") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content") }) - @Description(desc = "打回重做步骤") + @Description(desc = "nmpap.processtaskstepredoapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); 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 00e0d2d265a0c17a808beb6cce175a71ba303cd4..fb21114926faa9e5e357b05bb45550eee07ce43a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java @@ -48,7 +48,7 @@ public class ProcessTaskStepStartIfNecessaryApi extends PrivateApiComponentBase @Input({ @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source") + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Description(desc = "nmpap.processtaskstepstartifnecessaryapi.getname") @Override diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferApi.java index 43ca36aa5c6ae7c19975d84e1016b3b03be4c354..fbb03e1247e72ed6a5e3962d7a00561d3d3febed 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferApi.java @@ -20,52 +20,52 @@ import java.util.List; @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskTransferApi extends PrivateApiComponentBase { - + @Autowired private ProcessTaskService processTaskService; - - @Override - public String getToken() { - return "processtask/transfer"; - } - @Override - public String getName() { - return "nmpap.processtasktransferapi.getname"; - } + @Override + public String getToken() { + return "processtask/transfer"; + } + + @Override + public String getName() { + return "nmpap.processtasktransferapi.getname"; + } - @Override - public String getConfig() { - return null; - } + @Override + public String getConfig() { + return null; + } - @Override - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), - @Param(name = "workerList", type = ApiParamType.NOAUTH, isRequired = true, desc = "nmpap.processtasktransferapi.input.param.desc.workerlist", help = "[\"user#userUuid\",\"team#teamUuid\",\"role#roleUuid\"]"), - @Param(name = "isSaveData", type = ApiParamType.ENUM, rule = "0,1", desc = "nmpap.processtasktransferapi.input.param.desc.issavedata"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content") - }) - @Output({}) - @Description(desc = "nmpap.processtasktransferapi.getname") - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); - Long processTaskStepId = jsonObj.getLong("processTaskStepId"); + @Override + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "workerList", type = ApiParamType.NOAUTH, isRequired = true, desc = "nmpap.processtasktransferapi.input.param.desc.workerlist", help = "[\"user#userUuid\",\"team#teamUuid\",\"role#roleUuid\"]"), + @Param(name = "isSaveData", type = ApiParamType.ENUM, rule = "0,1", desc = "nmpap.processtasktransferapi.input.param.desc.issavedata"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content") + }) + @Output({}) + @Description(desc = "nmpap.processtasktransferapi.getname") + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + Long processTaskStepId = jsonObj.getLong("processTaskStepId"); - List workerList = new ArrayList<>(); - Object workerListObj = jsonObj.get("workerList"); - if(workerListObj instanceof JSONArray) { - workerList = JSON.parseArray(JSON.toJSONString(workerListObj), String.class); - }else if(workerListObj instanceof String) { - workerList.add((String)workerListObj); - } - Integer isSaveData = jsonObj.getInteger("isSaveData"); - String source = jsonObj.getString("source"); - String content = jsonObj.getString("content"); - processTaskService.transferProcessTaskStep(processTaskId, processTaskStepId, workerList, isSaveData, content, source); - return null; - } + List workerList = new ArrayList<>(); + Object workerListObj = jsonObj.get("workerList"); + if (workerListObj instanceof JSONArray) { + workerList = JSON.parseArray(JSON.toJSONString(workerListObj), String.class); + } else if (workerListObj instanceof String) { + workerList.add((String) workerListObj); + } + Integer isSaveData = jsonObj.getInteger("isSaveData"); + String source = jsonObj.getString("source"); + String content = jsonObj.getString("content"); + processTaskService.transferProcessTaskStep(processTaskId, processTaskStepId, workerList, isSaveData, content, source); + return null; + } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java index ce1754ad1ee496a9098cbcf9c15719caca3358f9..4246d621c932134d8371a36749adad0b97906753 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskTransferKnowledgeAuditApi.java @@ -27,7 +27,7 @@ public class ProcessTaskTransferKnowledgeAuditApi extends PrivateApiComponentBas @Autowired private ProcessTaskMapper processTaskMapper; - + @Autowired private ProcessTaskService processTaskService; @@ -41,7 +41,7 @@ public class ProcessTaskTransferKnowledgeAuditApi extends PrivateApiComponentBas @Override public String getName() { - return "记录工单转知识活动"; + return "nmpap.processtasktransferknowledgeauditapi.getname"; } @Override @@ -50,11 +50,11 @@ public class ProcessTaskTransferKnowledgeAuditApi extends PrivateApiComponentBas } @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "title", type = ApiParamType.STRING, isRequired = true, desc = "知识标题") + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "title", type = ApiParamType.STRING, isRequired = true, desc = "common.title") }) - @Description(desc = "记录工单转知识活动") + @Description(desc = "nmpap.processtasktransferknowledgeauditapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java index 4cccec3fda688566dcc3bb2a94d1d7861e66ef3c..162dbc7f12dbed74f6ebf85b2479bba6077c70c5 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUpdateApi.java @@ -84,7 +84,7 @@ public class ProcessTaskUpdateApi extends PrivateApiComponentBase { @Override public String getName() { - return "更新工单信息"; + return "nmpap.processtaskupdateapi.getname"; } @Override @@ -92,15 +92,17 @@ public class ProcessTaskUpdateApi extends PrivateApiComponentBase { return null; } - @Input({@Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "步骤id"), - @Param(name = "title", type = ApiParamType.STRING, maxLength = 200, desc = "标题"), - @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "优先级uuid"), - @Param(name = "content", type = ApiParamType.STRING, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), - @Param(name = "tagList", type = ApiParamType.JSONARRAY, desc = "标签列表"), - @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "附件id列表")}) - @Description(desc = "更新工单信息") + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "term.itsm.processtaskstepid"), + @Param(name = "title", type = ApiParamType.STRING, maxLength = 200, desc = "common.title"), + @Param(name = "priorityUuid", type = ApiParamType.STRING, desc = "common.priorityuuid"), + @Param(name = "content", type = ApiParamType.STRING, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), + @Param(name = "tagList", type = ApiParamType.JSONARRAY, desc = "common.taglist"), + @Param(name = "fileIdList", type = ApiParamType.JSONARRAY, desc = "common.fileidlist") + }) + @Description(desc = "nmpap.processtaskupdateapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskId = jsonObj.getLong("processTaskId"); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java index d0f70f073236d3967b5871e609f0cff416e09a87..cb9160dce7f5adad0a641ba43f3191b8949fab56 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskUrgeApi.java @@ -30,62 +30,62 @@ import java.util.List; @OperationType(type = OperationTypeEnum.CREATE) @AuthAction(action = PROCESS_BASE.class) public class ProcessTaskUrgeApi extends PrivateApiComponentBase { - + @Resource private ProcessTaskMapper processTaskMapper; @Resource private ProcessTaskService processTaskService; @Resource private IProcessStepHandlerUtil processStepHandlerUtil; - @Resource - private ProcessTaskAgentService processTaskAgentService; + @Resource + private ProcessTaskAgentService processTaskAgentService; - @Override - public String getToken() { - return "processtask/urge"; - } + @Override + public String getToken() { + return "processtask/urge"; + } - @Override - public String getName() { - return "催办工单"; - } + @Override + public String getName() { + return "nmpap.processtaskurgeapi.getname"; + } - @Override - public String getConfig() { - return null; - } + @Override + public String getConfig() { + return null; + } - @Input({ - @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单Id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") - }) - @Description(desc = "催办工单") - @Override - public Object myDoService(JSONObject jsonObj) throws Exception { - Long processTaskId = jsonObj.getLong("processTaskId"); - ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); - new ProcessAuthManager.TaskOperationChecker(processTaskId, ProcessTaskOperationType.PROCESSTASK_URGE) - .build() - .checkAndNoPermissionThrowException(); - List processTaskStepList = processTaskService.getUrgeableStepList(processTaskVo, UserContext.get().getUserUuid(true)); - /** 如果当前用户接受了其他用户的授权，查出其他用户拥有的权限，叠加当前用户权限里 **/ - List fromUserUUidList = processTaskAgentService.getFromUserUuidListByToUserUuidAndChannelUuid(UserContext.get().getUserUuid(true), processTaskVo.getChannelUuid()); - for (String userUuid : fromUserUUidList) { - processTaskStepList.addAll(processTaskService.getUrgeableStepList(processTaskVo, userUuid)); - } - for(ProcessTaskStepVo processTaskStepVo : processTaskStepList) { - /** 触发通知 **/ - processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepNotifyTriggerType.URGE); - processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepNotifyTriggerType.URGE); - } - // 催办记录 - processTaskMapper.insertProcessTaskUrge(processTaskId, UserContext.get().getUserUuid(true)); - /*生成催办活动*/ - ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); - processTaskStepVo.setProcessTaskId(processTaskId); - processTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.URGE); - return null; - } + @Input({ + @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") + }) + @Description(desc = "nmpap.processtaskurgeapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + ProcessTaskVo processTaskVo = processTaskService.checkProcessTaskParamsIsLegal(processTaskId); + new ProcessAuthManager.TaskOperationChecker(processTaskId, ProcessTaskOperationType.PROCESSTASK_URGE) + .build() + .checkAndNoPermissionThrowException(); + List processTaskStepList = processTaskService.getUrgeableStepList(processTaskVo, UserContext.get().getUserUuid(true)); + /** 如果当前用户接受了其他用户的授权，查出其他用户拥有的权限，叠加当前用户权限里 **/ + List fromUserUUidList = processTaskAgentService.getFromUserUuidListByToUserUuidAndChannelUuid(UserContext.get().getUserUuid(true), processTaskVo.getChannelUuid()); + for (String userUuid : fromUserUUidList) { + processTaskStepList.addAll(processTaskService.getUrgeableStepList(processTaskVo, userUuid)); + } + for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { + /** 触发通知 **/ + processStepHandlerUtil.notify(processTaskStepVo, ProcessTaskStepNotifyTriggerType.URGE); + processStepHandlerUtil.action(processTaskStepVo, ProcessTaskStepNotifyTriggerType.URGE); + } + // 催办记录 + processTaskMapper.insertProcessTaskUrge(processTaskId, UserContext.get().getUserUuid(true)); + /*生成催办活动*/ + ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); + processTaskStepVo.setProcessTaskId(processTaskId); + processTaskStepVo.getParamObj().put("source", jsonObj.getString("source")); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.URGE); + return null; + } } diff --git a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java index 7a06886f64c19194d94a9177aeaa6c08c0c15e0e..b3de4b53959a7fc536608657879b404942d2d7ac 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java @@ -81,7 +81,7 @@ public class UpdateProcessTaskFormApi extends PrivateApiComponentBase { @Input({ @Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskid"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), @Param(name = "formAttributeDataList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.formattributedatalist"), @Param(name = "formExtendAttributeDataList", type = ApiParamType.JSONARRAY, desc = "term.itsm.formextendattributedatalist"), @Param(name = "hidecomponentList", type = ApiParamType.JSONARRAY, desc = "term.itsm.hidecomponentlist"), 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 e9b056ace238d3bf9ba4d98a9ba44a1ab2ec7cea..99c989d1a90944d48034bac929b51ce647ac7e29 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 @@ -57,13 +57,13 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB @Autowired private ChannelMapper channelMapper; - + @Autowired private PriorityMapper priorityMapper; - + @Autowired private WorktimeMapper worktimeMapper; - + @Autowired private FileMapper fileMapper; @@ -77,7 +77,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB @Override public String getName() { - return "导入工单数据(通过固定格式json文件)"; + return "nmpapd.processtaskimportfromjsonapi.getname"; } @Override @@ -86,12 +86,12 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB } @Input({ - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source"), }) @Output({ }) - @Description(desc = "目前用于同步老工单数据到本系统") + @Description(desc = "nmpapd.processtaskimportfromjsonapi.getname") @Override public Object myDoService(JSONObject paramObj, JSONReader jsonReader) throws Exception { String source = paramObj.getString("source"); @@ -101,18 +101,18 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB while (jsonReader.hasNext()) { ProcessTaskVo processTask = new ProcessTaskVo(); Boolean isContinute = false; - Map stepIdUuidMap = new HashMap(); + Map stepIdUuidMap = new HashMap(); jsonReader.startObject(); while (jsonReader.hasNext()) { String taskKey = jsonReader.readString(); String taskValue = StringUtils.EMPTY; - if(isContinute) { - taskValue =jsonReader.readObject().toString(); + if (isContinute) { + taskValue = jsonReader.readObject().toString(); continue; } - if(!taskKey.equals("processTaskStepList")&&!taskKey.equals("processTaskStepRelList")&&!taskKey.equals("formAndPropList")) { - taskValue =jsonReader.readObject().toString(); - if(taskValue.equals(StringUtils.EMPTY)) { + if (!taskKey.equals("processTaskStepList") && !taskKey.equals("processTaskStepRelList") && !taskKey.equals("formAndPropList")) { + taskValue = jsonReader.readObject().toString(); + if (taskValue.equals(StringUtils.EMPTY)) { continue; } } @@ -125,9 +125,9 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB break; case "processName": ProcessVo process = processMapper.getProcessByName(taskValue); - if(process == null) { + if (process == null) { isContinute = true; - String errorTask = processTask.getId()+" 工单的 '"+taskValue+"' 流程不存在"; + String errorTask = processTask.getId() + " 工单的 '" + taskValue + "' 流程不存在"; logger.error(errorTask); errorTaskList.add(errorTask); break; @@ -142,9 +142,9 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB break; case "channelName": ChannelVo channel = channelMapper.getChannelByName(taskValue); - if(channel == null) { + if (channel == null) { isContinute = true; - String errorTask = processTask.getId()+" 工单的 '"+taskValue+"' 服务不存在"; + String errorTask = processTask.getId() + " 工单的 '" + taskValue + "' 服务不存在"; logger.error(errorTask); errorTaskList.add(errorTask); break; @@ -164,9 +164,9 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB break; case "priorityName": PriorityVo priority = priorityMapper.getPriorityByName(taskValue); - if(priority == null) { + if (priority == null) { isContinute = true; - String errorTask = processTask.getId()+" 工单的 '"+taskValue+"' 优先级不存在"; + String errorTask = processTask.getId() + " 工单的 '" + taskValue + "' 优先级不存在"; logger.error(errorTask); errorTaskList.add(errorTask); break; @@ -196,14 +196,14 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB jsonReader.startArray(); List processStepList = processMapper.getProcessStepDetailByProcessUuid(processTask.getProcessUuid()); while (jsonReader.hasNext()) { - ProcessTaskStepVo processTaskStep = new ProcessTaskStepVo(); - + ProcessTaskStepVo processTaskStep = new ProcessTaskStepVo(); + Boolean isSaveProcessStep = true; jsonReader.startObject(); while (jsonReader.hasNext()) { String taskStepKey = jsonReader.readString(); - String taskStepValue = (!taskStepKey.equals("processTaskStepContentList"))? jsonReader.readObject().toString():StringUtils.EMPTY; - if(!taskStepKey.equals("processTaskStepContentList")&&taskStepValue.equals(StringUtils.EMPTY)) { + String taskStepValue = (!taskStepKey.equals("processTaskStepContentList")) ? jsonReader.readObject().toString() : StringUtils.EMPTY; + if (!taskStepKey.equals("processTaskStepContentList") && taskStepValue.equals(StringUtils.EMPTY)) { continue; } processTaskStep.setProcessTaskId(processTask.getId()); @@ -214,16 +214,16 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB case "name": processTaskStep.setName(taskStepValue); List processStep = null; - if("开始".equals(taskStepValue)) { - processStep = processStepList.stream().filter(o ->ProcessStepType.START.getValue().equals(o.getType())).collect(Collectors.toList()); + if ("开始".equals(taskStepValue)) { + processStep = processStepList.stream().filter(o -> ProcessStepType.START.getValue().equals(o.getType())).collect(Collectors.toList()); processTaskStep.setProcessStepUuid(processStep.get(0).getUuid()); stepIdUuidMap.put(processTaskStep.getId(), processTaskStep.getProcessStepUuid()); - }else { - processStep = processStepList.stream().filter(o ->o.getName().equals(taskStepValue)).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(processStep)) { + } else { + processStep = processStepList.stream().filter(o -> o.getName().equals(taskStepValue)).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(processStep)) { processTaskStep.setProcessStepUuid(processStep.get(0).getUuid()); stepIdUuidMap.put(processTaskStep.getId(), processTaskStep.getProcessStepUuid()); - }else { + } else { isSaveProcessStep = false; break; } @@ -234,7 +234,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB break; case "type": processTaskStep.setType(taskStepValue); - if(taskStepValue.equals(ProcessStepType.START.getValue())) { + if (taskStepValue.equals(ProcessStepType.START.getValue())) { processTask.setStartProcessTaskStep(processTaskStep); } break; @@ -250,7 +250,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB case "configHash": String configHash = DigestUtils.md5DigestAsHex(taskStepValue.getBytes()); processTaskStep.setConfigHash(configHash); - processTaskMapper.insertIgnoreProcessTaskStepConfig(new ProcessTaskStepConfigVo(configHash,taskStepValue)); + processTaskMapper.insertIgnoreProcessTaskStepConfig(new ProcessTaskStepConfigVo(configHash, taskStepValue)); break; case "processTaskStepContentList": jsonReader.startArray(); @@ -260,9 +260,9 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB while (jsonReader.hasNext()) { String taskStepContentKey = jsonReader.readString(); String taskStepContentValue = StringUtils.EMPTY; - if(!taskStepContentKey.equals("fileList")) { + if (!taskStepContentKey.equals("fileList")) { taskStepContentValue = jsonReader.readObject().toString(); - if(taskStepContentValue.equals(StringUtils.EMPTY)) { + if (taskStepContentValue.equals(StringUtils.EMPTY)) { continue; } } @@ -271,7 +271,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB String content = StringEscapeUtils.unescapeHtml4(taskStepContentValue); String hash = DigestUtils.md5DigestAsHex(content.getBytes()); processTaskStepContentVo.setContentHash(hash); - processTaskMapper.insertIgnoreProcessTaskContent(new ProcessTaskContentVo(hash,content)); + processTaskMapper.insertIgnoreProcessTaskContent(new ProcessTaskContentVo(hash, content)); break; case "fcu": processTaskStepContentVo.setFcu(taskStepContentValue); @@ -288,7 +288,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB while (jsonReader.hasNext()) { String taskStepFileKey = jsonReader.readString(); String taskStepFileValue = jsonReader.readObject().toString(); - switch(taskStepFileKey) { + switch (taskStepFileKey) { case "id": file.setId(Long.valueOf(taskStepFileValue)); break; @@ -305,7 +305,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB //file.setUploadTime(taskStepFileValue); break; case "path": - file.setPath("file:"+taskStepFileValue); + file.setPath("file:" + taskStepFileValue); break; case "contentType": file.setContentType(taskStepFileValue); @@ -341,7 +341,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB } } jsonReader.endObject(); - if(isSaveProcessStep) { + if (isSaveProcessStep) { processTaskMapper.replaceProcessTaskStep(processTaskStep); } } @@ -407,7 +407,7 @@ public class ProcessTaskImportFromJsonApi extends PrivateJsonStreamApiComponentB } } jsonReader.endObject(); - if(!isContinute) { + if (!isContinute) { processTaskList.add(processTask); processTaskMapper.replaceProcessTask(processTask); } diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java index b56c45af6f7b4bcd67b6370605c55eb358cbad3f..2330225d88847678e0ea512b640e43faacdb00d4 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java @@ -47,7 +47,7 @@ public class ProcessTaskStepTaskCompleteApi extends PrivateApiComponentBase { @Override public String getName() { - return "任务完成接口"; + return "nmpapt.processtasksteptaskcompleteapi.getname"; } @Override @@ -56,13 +56,13 @@ public class ProcessTaskStepTaskCompleteApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "id", isRequired = true, type = ApiParamType.LONG, desc = "任务id"), - @Param(name = "button", type = ApiParamType.STRING, desc = "按钮"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "id", isRequired = true, type = ApiParamType.LONG, desc = "term.rdm.issueid"), + @Param(name = "button", type = ApiParamType.STRING, desc = "common.button"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) - @Description(desc = "任务完成接口") + @Description(desc = "nmpapt.processtasksteptaskcompleteapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long id = jsonObj.getLong("id"); 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 e86b5edcde592e93ef3a65d1e7d624671185736f..59ce93415c162029872589eae7b16bbecf17e5f2 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 @@ -69,7 +69,7 @@ public class ProcessTaskStepTaskDeleteApi extends PrivateApiComponentBase { @Override public String getName() { - return "删除任务"; + return "nmrai.deleteissueapi.getname"; } @Override @@ -78,11 +78,11 @@ public class ProcessTaskStepTaskDeleteApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "processTaskStepTaskId", type = ApiParamType.LONG, isRequired = true, desc = "任务id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "processTaskStepTaskId", type = ApiParamType.LONG, isRequired = true, desc = "term.rdm.issueid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) - @Description(desc = "任务删除接口") + @Description(desc = "nmrai.deleteissueapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long processTaskStepTaskId = jsonObj.getLong("processTaskStepTaskId"); diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java index 967faffa596aa9d3755bced67e79ccfe3e07fd23..c0491a3689ab6f55612031e1eab2b26b42fd31a1 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileDeleteApi.java @@ -77,7 +77,7 @@ public class ProcessTaskStepTaskFileDeleteApi extends PrivateApiComponentBase { @Override public String getName() { - return "任务删除附件接口"; + return "nmpapt.processtasksteptaskfiledeleteapi.getname"; } @Override @@ -86,12 +86,12 @@ public class ProcessTaskStepTaskFileDeleteApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "id", isRequired = true, type = ApiParamType.LONG, desc = "任务id"), - @Param(name = "fileId", isRequired = true, type = ApiParamType.LONG, desc = "附件id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "id", isRequired = true, type = ApiParamType.LONG, desc = "term.rdm.issueid"), + @Param(name = "fileId", isRequired = true, type = ApiParamType.LONG, desc = "common.fileid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) - @Description(desc = "任务删除附件接口") + @Description(desc = "nmpapt.processtasksteptaskfiledeleteapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long id = jsonObj.getLong("id"); diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java index d1199682de96e21e83e6989a7ed078031b5be580..496528360ed17036e5242b1eca92468cd225eab3 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskFileSaveApi.java @@ -77,7 +77,7 @@ public class ProcessTaskStepTaskFileSaveApi extends PrivateApiComponentBase { @Override public String getName() { - return "任务上传附件接口"; + return "nmpapt.processtasksteptaskfilesaveapi.getname"; } @Override @@ -86,12 +86,12 @@ public class ProcessTaskStepTaskFileSaveApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "id", isRequired = true, type = ApiParamType.LONG, desc = "任务id"), - @Param(name = "fileId", isRequired = true, type = ApiParamType.LONG, desc = "附件id"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "id", isRequired = true, type = ApiParamType.LONG, desc = "term.rdm.issueid"), + @Param(name = "fileId", isRequired = true, type = ApiParamType.LONG, desc = "common.fileid"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({}) - @Description(desc = "任务上传附件接口") + @Description(desc = "nmpapt.processtasksteptaskfilesaveapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long id = jsonObj.getLong("id"); 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 cacd1eeb43c023b703e535aa236a72d42b0f0809..da8a201c7e561a23bfffda554cca852b9a50a210 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 @@ -52,7 +52,7 @@ public class ProcessTaskStepTaskSaveApi extends PrivateApiComponentBase { @Override public String getName() { - return "保存任务"; + return "nmrai.saveissueapi.getname"; } @Override @@ -61,17 +61,17 @@ public class ProcessTaskStepTaskSaveApi extends PrivateApiComponentBase { } @Input({ - @Param(name = "id", type = ApiParamType.LONG, desc = "任务id，如果不为空则是编辑，为空则新增"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "步骤id"), - @Param(name = "stepTaskUserVoList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "任务处理人列表"), - @Param(name = "taskConfigId", type = ApiParamType.LONG, isRequired = true, desc = "任务策略id"), - @Param(name = "content", type = ApiParamType.STRING, isRequired = true, minLength = 1, desc = "描述"), - @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "来源") + @Param(name = "id", type = ApiParamType.LONG, desc = "term.rdm.issueid", help = "如果不为空则是编辑，为空则新增"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.processtaskstepid"), + @Param(name = "stepTaskUserVoList", type = ApiParamType.JSONARRAY, isRequired = true, desc = "term.itsm.steptaskuserlist"), + @Param(name = "taskConfigId", type = ApiParamType.LONG, isRequired = true, desc = "term.itsm.taskconfigid"), + @Param(name = "content", type = ApiParamType.STRING, isRequired = true, minLength = 1, desc = "common.content"), + @Param(name = "source", type = ApiParamType.STRING, desc = "common.source") }) @Output({ - @Param(name = "Return", type = ApiParamType.LONG, desc = "任务id") + @Param(name = "Return", type = ApiParamType.LONG, desc = "term.rdm.issueid") }) - @Description(desc = "保存任务接口") + @Description(desc = "nmrai.saveissueapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { Long id = jsonObj.getLong("id");