From a5f8c4355335323d18a6781b88281f4ebd045722 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 13 Jun 2024 16:21:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=BC=80=E5=A7=8B=E5=A4=84=E7=90=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1178251643289600]后端-工单开始处理按钮优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1178251643289600 --- .../utilhandler/ConditionProcessUtilHandler.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java index f568e8b52..07fbbaae1 100755 --- a/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/utilhandler/ConditionProcessUtilHandler.java @@ -46,6 +46,14 @@ public class ConditionProcessUtilHandler extends ProcessStepInternalHandlerBase } + @Override + public JSONObject makeupConfig(JSONObject configObj) { + if (configObj == null) { + configObj = new JSONObject(); + } + return configObj; + } + @Override public JSONObject regulateProcessStepConfig(JSONObject configObj) { if (configObj == null) { -- Gitee From ecb1a7739a97573f2f773fdda7e4971c63890cc4 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 13 Jun 2024 16:23:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=BC=80=E5=A7=8B=E5=A4=84=E7=90=86=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #[1178251643289600]后端-工单开始处理按钮优化 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1178251643289600 --- .../api/processtask/ProcessTaskStartApi.java | 17 ++-- .../ProcessTaskStepStartIfNecessaryApi.java | 79 +++++++++++++++++++ 2 files changed, 87 insertions(+), 9 deletions(-) create mode 100644 src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java 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 3b8e06c16..bdfeed83d 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStartApi.java @@ -1,10 +1,10 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.crossover.IProcessTaskStartApiCrossoverService; import neatlogic.framework.restful.annotation.Description; import neatlogic.framework.restful.annotation.Input; import neatlogic.framework.restful.annotation.OperationType; @@ -12,7 +12,6 @@ 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.stereotype.Service; import javax.annotation.Resource; @@ -20,7 +19,7 @@ import javax.annotation.Resource; @Service @OperationType(type = OperationTypeEnum.UPDATE) @AuthAction(action = PROCESS_BASE.class) -public class ProcessTaskStartApi extends PrivateApiComponentBase implements IProcessTaskStartApiCrossoverService { +public class ProcessTaskStartApi extends PrivateApiComponentBase { @Resource private ProcessTaskService processTaskService; @@ -32,7 +31,7 @@ public class ProcessTaskStartApi extends PrivateApiComponentBase implements IPro @Override public String getName() { - return "工单步骤开始接口"; + return "nmpap.processtaskstartapi.getname"; } @Override @@ -41,12 +40,12 @@ public class ProcessTaskStartApi extends PrivateApiComponentBase implements IPro } @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 = "action", type = ApiParamType.ENUM, rule = "accept,start", 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, defaultValue = "pc", desc = "common.source"), + @Param(name = "action", type = ApiParamType.ENUM, rule = "accept,start", isRequired = true, desc = "common.actiontype") }) - @Description(desc = "工单步骤开始接口") + @Description(desc = "nmpap.processtaskstartapi.getname") @Override public Object myDoService(JSONObject jsonObj) throws Exception { processTaskService.startProcessTaskStep(jsonObj); diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java new file mode 100644 index 000000000..26b42df34 --- /dev/null +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepStartIfNecessaryApi.java @@ -0,0 +1,79 @@ +package neatlogic.module.process.api.processtask; + + +import com.alibaba.fastjson.JSONObject; +import neatlogic.framework.auth.core.AuthAction; +import neatlogic.framework.common.constvalue.ApiParamType; +import neatlogic.framework.process.auth.PROCESS_BASE; +import neatlogic.framework.process.constvalue.ProcessTaskOperationType; +import neatlogic.framework.process.operationauth.core.ProcessAuthManager; +import neatlogic.framework.restful.annotation.Description; +import neatlogic.framework.restful.annotation.Input; +import neatlogic.framework.restful.annotation.OperationType; +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 org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Map; +import java.util.Set; + +@Service +@OperationType(type = OperationTypeEnum.UPDATE) +@AuthAction(action = PROCESS_BASE.class) +public class ProcessTaskStepStartIfNecessaryApi extends PrivateApiComponentBase { + + @Resource + private ProcessTaskService processTaskService; + + @Override + public String getToken() { + return "processtask/step/start/ifnecessary"; + } + + @Override + public String getName() { + return "nmpap.processtaskstepstartifnecessaryapi.getname"; + } + + @Override + public String getConfig() { + return null; + } + + @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") + }) + @Description(desc = "nmpap.processtaskstepstartifnecessaryapi.getname") + @Override + public Object myDoService(JSONObject jsonObj) throws Exception { + Long processTaskId = jsonObj.getLong("processTaskId"); + Long processTaskStepId = jsonObj.getLong("processTaskStepId"); + Map> operationTypeSetMap = new ProcessAuthManager.Builder() + .addProcessTaskId(processTaskId) + .addProcessTaskStepId(processTaskStepId) + .addOperationType(ProcessTaskOperationType.STEP_START) + .addOperationType(ProcessTaskOperationType.STEP_ACCEPT) + .build() + .getOperateMap(); + Set processTaskOperationTypeList = operationTypeSetMap.get(processTaskStepId); + if (CollectionUtils.isNotEmpty(processTaskOperationTypeList)) { + if (processTaskOperationTypeList.contains(ProcessTaskOperationType.STEP_ACCEPT)) { + jsonObj.put("action", ProcessTaskOperationType.STEP_ACCEPT.getValue()); + System.out.println("jsonObj = " + jsonObj); + processTaskService.startProcessTaskStep(jsonObj); + } else if (processTaskOperationTypeList.contains(ProcessTaskOperationType.STEP_START)) { + jsonObj.put("action", ProcessTaskOperationType.STEP_START.getValue()); + System.out.println("jsonObj = " + jsonObj); + processTaskService.startProcessTaskStep(jsonObj); + } + } + return null; + } + +} -- Gitee