From 64ae708d3dc488df84e0ba70cc51f3d241a22ead Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 11 May 2024 19:02:21 +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=A2=9E=E5=8A=A0=E6=9E=B6=E6=9E=84=E5=9B=BE=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=92=8C=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=8D=95=E6=B6=88=E8=B4=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1154412335038464]后端-增加架构图节点和自动化节点的获取表单消费数据逻辑 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1154412335038464 --- .../component/AutoexecProcessComponent.java | 47 ++++++++++++------- 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java index aaf088cb..ea376eab 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java @@ -39,12 +39,14 @@ import neatlogic.framework.dao.mapper.runner.RunnerMapper; import neatlogic.framework.dto.runner.RunnerGroupVo; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.form.dto.FormAttributeVo; -import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.notify.core.INotifyParamHandler; import neatlogic.framework.notify.core.NotifyParamHandlerFactory; import neatlogic.framework.process.constvalue.*; import neatlogic.framework.process.crossover.*; -import neatlogic.framework.process.dto.*; +import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; +import neatlogic.framework.process.dto.ProcessTaskStepDataVo; +import neatlogic.framework.process.dto.ProcessTaskStepVo; +import neatlogic.framework.process.dto.ProcessTaskStepWorkerVo; import neatlogic.framework.process.exception.processtask.ProcessTaskException; import neatlogic.framework.process.exception.processtask.ProcessTaskNoPermissionException; import neatlogic.framework.process.notify.constvalue.ProcessTaskNotifyParam; @@ -78,6 +80,8 @@ import java.util.stream.Collectors; public class AutoexecProcessComponent extends ProcessStepHandlerBase { private final static Logger logger = LoggerFactory.getLogger(AutoexecProcessComponent.class); + + private final String FORM_EXTEND_ATTRIBUTE_TAG = "autoexecProcessComponent"; @Resource private AutoexecJobMapper autoexecJobMapper; @@ -280,22 +284,29 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { Map formAttributeMap = new HashMap<>(); Long processTaskId = currentProcessTaskStepVo.getProcessTaskId(); // 如果工单有表单信息，则查询出表单配置及数据 - ProcessTaskFormVo processTaskFormVo = processTaskCrossoverMapper.getProcessTaskFormByProcessTaskId(processTaskId); - if (processTaskFormVo != null) { - String formContent = selectContentByHashCrossoverMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); - FormVersionVo formVersionVo = new FormVersionVo(); - formVersionVo.setFormUuid(processTaskFormVo.getFormUuid()); - formVersionVo.setFormName(processTaskFormVo.getFormName()); - formVersionVo.setFormConfig(JSON.parseObject(formContent)); - List formAttributeList = formVersionVo.getFormAttributeList(); - if (CollectionUtils.isNotEmpty(formAttributeList)) { - formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(e -> e.getUuid(), e -> e)); - } - IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); - List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskId); - if (CollectionUtils.isNotEmpty(processTaskFormAttributeDataList)) { - processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e)); - } +// ProcessTaskFormVo processTaskFormVo = processTaskCrossoverMapper.getProcessTaskFormByProcessTaskId(processTaskId); +// if (processTaskFormVo != null) { +// String formContent = selectContentByHashCrossoverMapper.getProcessTaskFromContentByHash(processTaskFormVo.getFormContentHash()); +// FormVersionVo formVersionVo = new FormVersionVo(); +// formVersionVo.setFormUuid(processTaskFormVo.getFormUuid()); +// formVersionVo.setFormName(processTaskFormVo.getFormName()); +// formVersionVo.setFormConfig(JSON.parseObject(formContent)); +// List formAttributeList = formVersionVo.getFormAttributeList(); +// if (CollectionUtils.isNotEmpty(formAttributeList)) { +// formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(e -> e.getUuid(), e -> e)); +// } +// IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); +// List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskId(processTaskId); +// if (CollectionUtils.isNotEmpty(processTaskFormAttributeDataList)) { +// processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e)); +// } +// } + IProcessTaskCrossoverService processTaskCrossoverService = CrossoverServiceFactory.getApi(IProcessTaskCrossoverService.class); + List formAttributeList = processTaskCrossoverService.getFormAttributeListByProcessTaskIdAngTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG); + if (CollectionUtils.isNotEmpty(formAttributeList)) { + formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(e -> e.getUuid(), e -> e)); + List processTaskFormAttributeDataList = processTaskCrossoverService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskId, FORM_EXTEND_ATTRIBUTE_TAG); + processTaskFormAttributeDataMap = processTaskFormAttributeDataList.stream().collect(Collectors.toMap(e -> e.getAttributeUuid(), e -> e)); } // 作业策略createJobPolicy为single时表示单次创建作业，createJobPolicy为batch时表示批量创建作业 String createJobPolicy = autoexecConfig.getString("createJobPolicy"); -- Gitee From 4cb46c76e6b9b77a5ead99790f097d7853cc145a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 11 May 2024 19:37:13 +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=A2=9E=E5=8A=A0=E6=9E=B6=E6=9E=84=E5=9B=BE=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=92=8C=E8=87=AA=E5=8A=A8=E5=8C=96=E8=8A=82=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=8D=95=E6=B6=88=E8=B4=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1154412335038464]后端-增加架构图节点和自动化节点的获取表单消费数据逻辑 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1154412335038464 --- .../stephandler/component/AutoexecProcessComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java index ea376eab..79858e70 100644 --- a/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/stephandler/component/AutoexecProcessComponent.java @@ -81,7 +81,7 @@ public class AutoexecProcessComponent extends ProcessStepHandlerBase { private final static Logger logger = LoggerFactory.getLogger(AutoexecProcessComponent.class); - private final String FORM_EXTEND_ATTRIBUTE_TAG = "autoexecProcessComponent"; + private final String FORM_EXTEND_ATTRIBUTE_TAG = "common"; @Resource private AutoexecJobMapper autoexecJobMapper; -- Gitee