From 653ff1a69a63ca2f967e806f78afb9ebe6d06315 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 11 May 2024 18:57:47 +0800 Subject: [PATCH 1/3] =?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 --- .../module/process/api/process/ProcessConditionList.java | 3 ++- .../handler/ProcessTaskFormAttributeCondition.java | 9 +++++---- .../stephandler/component/ConditionProcessComponent.java | 3 +++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java index b79b787e3..9141a5e60 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessConditionList.java @@ -24,6 +24,7 @@ import neatlogic.framework.process.constvalue.ConditionProcessTaskOptions; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; +import neatlogic.module.process.stephandler.component.ConditionProcessComponent; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -104,7 +105,7 @@ public class ProcessConditionList extends PrivateApiComponentBase { } // TODO 需要确定条件节点表单扩展属性标签 IFormCrossoverService formCrossoverService = CrossoverServiceFactory.getApi(IFormCrossoverService.class); - List formAttrList = formCrossoverService.getFormAttributeList(formUuid, form.getName(), "processConditionComponent"); + List formAttrList = formCrossoverService.getFormAttributeList(formUuid, form.getName(), ConditionProcessComponent.FORM_EXTEND_ATTRIBUTE_TAG); for (FormAttributeVo formAttributeVo : formAttrList) { IFormAttributeHandler formHandler = FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler()); if (formHandler == null) { diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java index 9ad2284fb..fc12523e1 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java @@ -42,6 +42,7 @@ import neatlogic.framework.util.FormUtil; import neatlogic.framework.util.Md5Util; import neatlogic.framework.util.TimeUtil; import neatlogic.module.process.service.ProcessTaskService; +import neatlogic.module.process.stephandler.component.ConditionProcessComponent; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -245,10 +246,10 @@ public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase @Override public Object getConditionParamData(ProcessTaskStepVo processTaskStepVo) { JSONObject resultObj = new JSONObject(); - List formAttributeList = processTaskService.getFormAttributeListByProcessTaskIdAngTag(processTaskStepVo.getProcessTaskId(), "processConditionComponent"); + List formAttributeList = processTaskService.getFormAttributeListByProcessTaskIdAngTag(processTaskStepVo.getProcessTaskId(), "conditionProcessComponent"); if (CollectionUtils.isNotEmpty(formAttributeList)) { Map formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(FormAttributeVo::getUuid, e -> e)); - List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskStepVo.getProcessTaskId(), "processConditionComponent"); + List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskStepVo.getProcessTaskId(), "conditionProcessComponent"); for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { FormAttributeVo formAttributeVo = formAttributeMap.get(processTaskFormAttributeDataVo.getAttributeUuid()); if (formAttributeVo == null) { @@ -270,10 +271,10 @@ public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase @Override public Object getConditionParamDataForHumanization(ProcessTaskStepVo processTaskStepVo) { JSONObject resultObj = new JSONObject(); - List formAttributeList = processTaskService.getFormAttributeListByProcessTaskIdAngTag(processTaskStepVo.getProcessTaskId(), "processConditionComponent"); + List formAttributeList = processTaskService.getFormAttributeListByProcessTaskIdAngTag(processTaskStepVo.getProcessTaskId(), ConditionProcessComponent.FORM_EXTEND_ATTRIBUTE_TAG); if (CollectionUtils.isNotEmpty(formAttributeList)) { Map formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(FormAttributeVo::getUuid, e -> e)); - List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskStepVo.getProcessTaskId(), "processConditionComponent"); + List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskStepVo.getProcessTaskId(), ConditionProcessComponent.FORM_EXTEND_ATTRIBUTE_TAG); for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { FormAttributeVo formAttributeVo = formAttributeMap.get(processTaskFormAttributeDataVo.getAttributeUuid()); if (formAttributeVo == null) { diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index af3464eba..0dd3638ea 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -53,6 +53,8 @@ import java.util.stream.Collectors; public class ConditionProcessComponent extends ProcessStepHandlerBase { static Logger logger = LoggerFactory.getLogger(ConditionProcessComponent.class); + public final static String FORM_EXTEND_ATTRIBUTE_TAG = "conditionProcessComponent"; + @Resource private ProcessTaskMapper processTaskMapper; @@ -143,6 +145,7 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { JSONArray conditionGroupList = moveonConfig.getJSONArray("conditionGroupList"); if (CollectionUtils.isNotEmpty(conditionGroupList)) { JSONObject conditionParamData = ProcessTaskConditionFactory.getConditionParamData(ConditionProcessTaskOptions.values(), currentProcessTaskStepVo); + System.out.println("conditionParamData = " + conditionParamData); ConditionConfigVo conditionConfigVo = null; try { ConditionParamContext.init(conditionParamData).setTranslate(true); -- Gitee From 0d8e2c8ed72f9b4d0be27070657209866757a660 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 11 May 2024 19:00:42 +0800 Subject: [PATCH 2/3] =?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 --- .../condition/handler/ProcessTaskFormAttributeCondition.java | 4 ++-- .../stephandler/component/ConditionProcessComponent.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java index fc12523e1..6266e3d58 100644 --- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java +++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskFormAttributeCondition.java @@ -246,10 +246,10 @@ public class ProcessTaskFormAttributeCondition extends ProcessTaskConditionBase @Override public Object getConditionParamData(ProcessTaskStepVo processTaskStepVo) { JSONObject resultObj = new JSONObject(); - List formAttributeList = processTaskService.getFormAttributeListByProcessTaskIdAngTag(processTaskStepVo.getProcessTaskId(), "conditionProcessComponent"); + List formAttributeList = processTaskService.getFormAttributeListByProcessTaskIdAngTag(processTaskStepVo.getProcessTaskId(), ConditionProcessComponent.FORM_EXTEND_ATTRIBUTE_TAG); if (CollectionUtils.isNotEmpty(formAttributeList)) { Map formAttributeMap = formAttributeList.stream().collect(Collectors.toMap(FormAttributeVo::getUuid, e -> e)); - List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskStepVo.getProcessTaskId(), "conditionProcessComponent"); + List processTaskFormAttributeDataList = processTaskService.getProcessTaskFormAttributeDataListByProcessTaskIdAndTag(processTaskStepVo.getProcessTaskId(), ConditionProcessComponent.FORM_EXTEND_ATTRIBUTE_TAG); for (ProcessTaskFormAttributeDataVo processTaskFormAttributeDataVo : processTaskFormAttributeDataList) { FormAttributeVo formAttributeVo = formAttributeMap.get(processTaskFormAttributeDataVo.getAttributeUuid()); if (formAttributeVo == null) { diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index 0dd3638ea..125e62ff6 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -145,7 +145,6 @@ public class ConditionProcessComponent extends ProcessStepHandlerBase { JSONArray conditionGroupList = moveonConfig.getJSONArray("conditionGroupList"); if (CollectionUtils.isNotEmpty(conditionGroupList)) { JSONObject conditionParamData = ProcessTaskConditionFactory.getConditionParamData(ConditionProcessTaskOptions.values(), currentProcessTaskStepVo); - System.out.println("conditionParamData = " + conditionParamData); ConditionConfigVo conditionConfigVo = null; try { ConditionParamContext.init(conditionParamData).setTranslate(true); -- Gitee From 13b315f957cd566e304904a6c3db9d70f8a4b6db Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Sat, 11 May 2024 19:38:04 +0800 Subject: [PATCH 3/3] =?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/ConditionProcessComponent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java index 125e62ff6..0eb5319d5 100644 --- a/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java +++ b/src/main/java/neatlogic/module/process/stephandler/component/ConditionProcessComponent.java @@ -53,7 +53,7 @@ import java.util.stream.Collectors; public class ConditionProcessComponent extends ProcessStepHandlerBase { static Logger logger = LoggerFactory.getLogger(ConditionProcessComponent.class); - public final static String FORM_EXTEND_ATTRIBUTE_TAG = "conditionProcessComponent"; + public final static String FORM_EXTEND_ATTRIBUTE_TAG = "common"; @Resource private ProcessTaskMapper processTaskMapper; -- Gitee