From 55c76bbe61e842514780736b121d97acfc743fe2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sun, 20 Apr 2025 15:13:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=80=BC=E7=8F=AD?= =?UTF-8?q?=E5=8A=A9=E6=89=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1299362674606080]值班助手 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1299362674606080 --- .../ProcessTaskRelationSaveApi.java | 44 +++---------------- .../process/service/ProcessTaskService.java | 7 +++ .../service/ProcessTaskServiceImpl.java | 28 ++++++++++++ 3 files changed, 40 insertions(+), 39 deletions(-) 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 90d467d15..39796f02a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskRelationSaveApi.java @@ -1,35 +1,28 @@ package neatlogic.module.process.api.processtask; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.process.auth.PROCESS_BASE; -import neatlogic.framework.process.constvalue.ProcessTaskAuditDetailType; -import neatlogic.framework.process.constvalue.ProcessTaskAuditType; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.crossover.IProcessTaskRelationSaveApiCrossoverService; -import neatlogic.module.process.dao.mapper.catalog.ChannelMapper; -import neatlogic.module.process.dao.mapper.catalog.ChannelTypeMapper; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; -import neatlogic.framework.process.dto.ProcessTaskRelationVo; -import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.channeltype.ChannelTypeRelationNotFoundException; import neatlogic.framework.process.operationauth.core.ProcessAuthManager; -import neatlogic.module.process.service.IProcessStepHandlerUtil; 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.dao.mapper.catalog.ChannelTypeMapper; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper; import neatlogic.module.process.service.ProcessTaskService; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.List; @Service @@ -41,18 +34,12 @@ public class ProcessTaskRelationSaveApi extends PrivateApiComponentBase implemen @Autowired private ProcessTaskMapper processTaskMapper; - @Autowired - private ChannelMapper channelMapper; - @Autowired private ChannelTypeMapper channelTypeMapper; @Autowired private ProcessTaskService processTaskService; - @Autowired - private IProcessStepHandlerUtil processStepHandlerUtil; - @Override public String getToken() { return "processtask/relation/save"; @@ -92,28 +79,7 @@ public class ProcessTaskRelationSaveApi extends PrivateApiComponentBase implemen List processTaskIdList = processTaskMapper.checkProcessTaskIdListIsExists(relationProcessTaskIdList); if (CollectionUtils.isNotEmpty(processTaskIdList)) { String source = jsonObj.getString("source"); - for (Long target : processTaskIdList) { - ProcessTaskRelationVo processTaskRelationVo = new ProcessTaskRelationVo(); - processTaskRelationVo.setSource(processTaskId); - processTaskRelationVo.setChannelTypeRelationId(channelTypeRelationId); - processTaskRelationVo.setTarget(target); - - processTaskMapper.replaceProcessTaskRelation(processTaskRelationVo); - ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); - processTaskStepVo.setProcessTaskId(target); - processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), - channelTypeRelationId); - processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), - JSON.toJSONString(Arrays.asList(processTaskId))); - processTaskStepVo.getParamObj().put("source", source); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.RELATION); - } - jsonObj.put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), - JSON.toJSONString(processTaskIdList)); - ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); - processTaskStepVo.setProcessTaskId(processTaskId); - processTaskStepVo.getParamObj().putAll(jsonObj); - processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.RELATION); + processTaskService.saveProcessTaskRelation(processTaskId, channelTypeRelationId, processTaskIdList, source); } } return null; diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java index 951f34744..fb7bbcb6a 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskService.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskService.java @@ -535,4 +535,11 @@ public interface ProcessTaskService { * @return 如果是无效步骤返回true，否则返回false */ boolean checkStepIsInvalid(Long processTaskStepId); + + void saveProcessTaskRelation( + Long processTaskId, + Long channelTypeRelationId, + List relationProcessTaskIdList, + String source + ); } diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java index b0fb82be3..3469bea41 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskServiceImpl.java @@ -3324,4 +3324,32 @@ public class ProcessTaskServiceImpl implements ProcessTaskService, IProcessTaskC } return true; } + + @Override + public void saveProcessTaskRelation(Long processTaskId, Long channelTypeRelationId, List relationProcessTaskIdList, String source) { + for (Long target : relationProcessTaskIdList) { + ProcessTaskRelationVo processTaskRelationVo = new ProcessTaskRelationVo(); + processTaskRelationVo.setSource(processTaskId); + processTaskRelationVo.setChannelTypeRelationId(channelTypeRelationId); + processTaskRelationVo.setTarget(target); + + processTaskMapper.replaceProcessTaskRelation(processTaskRelationVo); + ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); + processTaskStepVo.setProcessTaskId(target); + processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), + channelTypeRelationId); + processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), + JSON.toJSONString(Collections.singletonList(processTaskId))); + processTaskStepVo.getParamObj().put("source", source); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.RELATION); + } + ProcessTaskStepVo processTaskStepVo = new ProcessTaskStepVo(); + processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.CHANNELTYPERELATION.getParamName(), + channelTypeRelationId); + processTaskStepVo.getParamObj().put(ProcessTaskAuditDetailType.PROCESSTASKLIST.getParamName(), + JSON.toJSONString(relationProcessTaskIdList)); + processTaskStepVo.setProcessTaskId(processTaskId); + processTaskStepVo.getParamObj().put("source", source); + processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.RELATION); + } } -- Gitee