From a7ce672cb3da10a1f97d99d4de2aa913d91b3578 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 24 Jun 2025 15:44:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=8A=82=E7=82=B9=E6=89=A7=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E7=BB=84=E8=A3=85=E8=BF=87=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1441356080185344]数据转换节点执行时收集组装过程数据 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1441356080185344 --- .../ProcessTaskStepDataGetApi.java | 63 +++++++++++++------ .../ProcessTaskStepDataMapper.java | 6 ++ .../processtask/ProcessTaskStepDataMapper.xml | 40 ++++++++++++ 3 files changed, 90 insertions(+), 19 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java index f096e158c..2b7b56cbc 100755 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskStepDataGetApi.java @@ -1,22 +1,20 @@ package neatlogic.module.process.api.processtask; -import neatlogic.framework.auth.core.AuthAction; -import neatlogic.framework.process.auth.PROCESS_BASE; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson.JSONObject; - +import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.common.constvalue.ApiParamType; -import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.dto.ProcessTaskStepDataVo; +import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; -import neatlogic.framework.restful.annotation.Description; -import neatlogic.framework.restful.annotation.Input; -import neatlogic.framework.restful.annotation.OperationType; -import neatlogic.framework.restful.annotation.Output; -import neatlogic.framework.restful.annotation.Param; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.framework.util.TableResultUtil; +import neatlogic.module.process.dao.mapper.processtask.ProcessTaskStepDataMapper; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; @Service @AuthAction(action = PROCESS_BASE.class) @@ -41,16 +39,43 @@ public class ProcessTaskStepDataGetApi extends PrivateApiComponentBase { return null; } - @Input({@Param(name = "processTaskId", type = ApiParamType.LONG, isRequired = true, desc = "工单id"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, isRequired = true, desc = "工单步骤id")}) - @Output({@Param(type = ApiParamType.STRING)}) + @Input({ + @Param(name = "id", type = ApiParamType.LONG, desc = "common.id"), + @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid"), + @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "term.itsm.processtaskstepid"), + @Param(name = "type", type = ApiParamType.STRING, desc = "common.type"), + @Param(name = "fcu", type = ApiParamType.STRING, desc = "common.createuser"), + }) + @Output({ + @Param(type = ApiParamType.JSONOBJECT) + }) @Description(desc = "获取工单步骤数据接口") @Override public Object myDoService(JSONObject jsonObj) throws Exception { - ProcessTaskStepDataVo p = jsonObj.toJavaObject(ProcessTaskStepDataVo.class); - ProcessTaskStepDataVo processTaskStepDataVo = processTaskStepDataMapper.getProcessTaskStepData(p); - if (processTaskStepDataVo != null) { - return processTaskStepDataVo.getData(); + Long id = jsonObj.getLong("id"); + if (id != null) { + ProcessTaskStepDataVo processTaskStepDataVo = processTaskStepDataMapper.getProcessTaskStepDataById(id); + if (processTaskStepDataVo != null) { + return processTaskStepDataVo.getData(); + } + } else { + Long processTaskId = jsonObj.getLong("processTaskId"); + Long processTaskStepId = jsonObj.getLong("processTaskStepId"); + String type = jsonObj.getString("type"); + String fcu = jsonObj.getString("fcu"); + ProcessTaskStepDataVo searchVo = new ProcessTaskStepDataVo(); + searchVo.setProcessTaskId(processTaskId); + searchVo.setProcessTaskStepId(processTaskStepId); + searchVo.setType(type); + searchVo.setFcu(fcu); + List processTaskStepDataList = processTaskStepDataMapper.searchProcessTaskStepData(searchVo); + if (CollectionUtils.isNotEmpty(processTaskStepDataList)) { + if (processTaskStepDataList.size() == 1) { + return processTaskStepDataList.get(0).getData(); + } else { + return TableResultUtil.getResult(processTaskStepDataList); + } + } } return null; } diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java index b8a30d3f3..1a33d6db7 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.java @@ -28,6 +28,12 @@ public interface ProcessTaskStepDataMapper extends IProcessTaskStepDataCrossover ProcessTaskStepDataVo getProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); + ProcessTaskStepDataVo getProcessTaskStepDataById(Long id); + + Long getProcessTaskStepDataId(ProcessTaskStepDataVo processTaskStepDataVo); + + int checkProcessTaskStepDataIdIsExists(Long id); + List searchProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); int replaceProcessTaskStepData(ProcessTaskStepDataVo processTaskStepDataVo); diff --git a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml index e871f8ebc..9219ec71d 100644 --- a/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml +++ b/src/main/java/neatlogic/module/process/dao/mapper/processtask/ProcessTaskStepDataMapper.xml @@ -60,6 +60,46 @@ LIMIT 1 + + + + + +