From 78b6cbd983810d2a5d947559fc51c0bf40724efb Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Mon, 21 Jul 2025 14:39:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=9B=86=E6=88=90=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E5=B9=B6?= =?UTF-8?q?=E5=8F=91=E6=95=B0=20#[1447956513783808]=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E6=94=AF=E6=8C=81=E9=80=89=E6=8B=A9=E5=B9=B6=E5=8F=91?= =?UTF-8?q?=E6=95=B0=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?= =?UTF-8?q?l/939050947543040/939050947543042/1447956513783808?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/autoexec/service/AutoexecJobServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java index 92799f01..67db9e40 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java @@ -661,7 +661,7 @@ public class AutoexecJobServiceImpl implements AutoexecJobService, IAutoexecJobC String parallelPolicyTmp = executeConfigVo.getParallelPolicy(); //兼容老数据不存在policy if (StringUtils.isBlank(parallelPolicyTmp) && executeConfigVo.getRoundCount() != null) { - parallelPolicy = AutoexecParallelPolicy.ROUND_COUNT.getValue(); + parallelPolicyTmp = AutoexecParallelPolicy.ROUND_COUNT.getValue(); } if (StringUtils.isNotBlank(parallelPolicyTmp)) { parallelPolicy = parallelPolicyTmp; @@ -699,7 +699,7 @@ public class AutoexecJobServiceImpl implements AutoexecJobService, IAutoexecJobC String parallelPolicyTmp = executeConfigVo.getParallelPolicy(); //兼容老数据不存在policy if (StringUtils.isBlank(parallelPolicyTmp) && executeConfigVo.getRoundCount() != null) { - parallelPolicy = AutoexecParallelPolicy.ROUND_COUNT.getValue(); + parallelPolicyTmp = AutoexecParallelPolicy.ROUND_COUNT.getValue(); } if (StringUtils.isNotBlank(parallelPolicyTmp)) { parallelPolicy = parallelPolicyTmp; -- Gitee From 99b7d141352305d9291a4ddaae9c88626ba24597 Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Mon, 21 Jul 2025 18:18:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]null=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/autoexec/process/util/CreateJobConfigUtil.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java index a986541f..8fce86e3 100644 --- a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java +++ b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java @@ -348,9 +348,10 @@ public class CreateJobConfigUtil { executeConfig.setParallelPolicy(parallelPolicy); }else{ CreateJobConfigMappingGroupVo mappingGroupVo = executeParamMappingGroupMap.get("parallelPolicy"); - if (CollectionUtils.isNotEmpty(mappingGroupVo.getMappingList()) && mappingGroupVo.getMappingList().get(0) != null && mappingGroupVo.getMappingList().get(0).getValue() != null) { - parallelPolicy = mappingGroupVo.getMappingList().get(0).getValue().toString(); - builder.setParallelPolicy(parallelPolicy); + if(mappingGroupVo != null && (CollectionUtils.isNotEmpty(mappingGroupVo.getMappingList()) && mappingGroupVo.getMappingList().get(0) != null && mappingGroupVo.getMappingList().get(0).getValue() != null)) { + parallelPolicy = mappingGroupVo.getMappingList().get(0).getValue().toString(); + builder.setParallelPolicy(parallelPolicy); + } } -- Gitee From 943fc703c55c95855743d8a4d20969cf4322da2f Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Mon, 21 Jul 2025 10:49:03 +0000 Subject: [PATCH 3/5] =?UTF-8?q?!107=20[=E5=8A=9F=E8=83=BD]=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=8A=A5=E9=94=99=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=B8=AD=E4=B8=8D=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=A0=88=E4=BF=A1=E6=81=AF=20*=20[=E5=8A=9F=E8=83=BD]=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E4=B8=8D=E4=BF=9D=E5=AD=98=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=A0=88=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stephandler/component/CreateJobProcessComponent.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java b/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java index 45046ca8..2a26daad 100644 --- a/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java +++ b/src/main/java/neatlogic/module/autoexec/process/stephandler/component/CreateJobProcessComponent.java @@ -60,7 +60,6 @@ import neatlogic.module.autoexec.service.AutoexecServiceService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -339,7 +338,7 @@ public class CreateJobProcessComponent extends ProcessStepHandlerBase { errorMessageObj.put("error", error); errorMessageObj.put("message", error); errorMessageObj.put("jobVo", builder); - errorMessageObj.put("stackTrace", ExceptionUtils.getStackFrames(e)); +// errorMessageObj.put("stackTrace", ExceptionUtils.getStackFrames(e)); errorMessageList.add(errorMessageObj); flag = true; } -- Gitee From 8eadcf421cdaca323f724e5de1205da250afc3a6 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Mon, 21 Jul 2025 10:58:35 +0000 Subject: [PATCH 4/5] =?UTF-8?q?!108=20[=E5=8A=9F=E8=83=BD]=20=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=8A=A5=E9=94=99=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E4=B8=AD=E4=B8=8D=E4=BF=9D=E5=AD=98=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=A0=88=E4=BF=A1=E6=81=AF=20*=20[=E5=8A=9F=E8=83=BD]=20?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E4=B8=8D=E4=BF=9D=E5=AD=98=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=A0=88=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autoexec/process/dto/AutoexecJobBuilder.java | 11 ----------- .../autoexec/process/util/CreateJobConfigUtil.java | 9 --------- 2 files changed, 20 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/process/dto/AutoexecJobBuilder.java b/src/main/java/neatlogic/module/autoexec/process/dto/AutoexecJobBuilder.java index 7237fc82..9002d4b1 100644 --- a/src/main/java/neatlogic/module/autoexec/process/dto/AutoexecJobBuilder.java +++ b/src/main/java/neatlogic/module/autoexec/process/dto/AutoexecJobBuilder.java @@ -55,9 +55,6 @@ public class AutoexecJobBuilder { @EntityField(name = "作业参数数据", type = ApiParamType.JSONOBJECT) private JSONObject param; - @EntityField(name = "原始数据", type = ApiParamType.JSONOBJECT) - private JSONObject rawData; - public Long getCombopId() { return combopId; } @@ -118,14 +115,6 @@ public class AutoexecJobBuilder { this.param = param; } - public JSONObject getRawData() { - return rawData; - } - - public void setRawData(JSONObject rawData) { - this.rawData = rawData; - } - public Integer getParallelCount() { return parallelCount; } diff --git a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java index 8fce86e3..48d99dfd 100644 --- a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java +++ b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java @@ -216,15 +216,6 @@ public class CreateJobConfigUtil { // 组合工具ID Long combopId = createJobConfigConfigVo.getCombopId(); AutoexecJobBuilder builder = new AutoexecJobBuilder(combopId); - JSONObject rawData = new JSONObject(); - rawData.put("currentProcessTaskStepVo", currentProcessTaskStepVo); - rawData.put("createJobConfigConfigVo", createJobConfigConfigVo); - rawData.put("autoexecCombopVersionVo", autoexecCombopVersionVo); - rawData.put("formAttributeList", formAttributeList); - rawData.put("originalFormAttributeDataMap", originalFormAttributeDataMap); - rawData.put("formTableComponentDataMap", formTableComponentDataMap); - rawData.put("processTaskParam", processTaskParam); - builder.setRawData(JSONObject.parseObject(rawData.toJSONString())); // 作业名称 String jobName = createJobConfigConfigVo.getJobName(); AutoexecCombopVersionConfigVo versionConfig = autoexecCombopVersionVo.getConfig(); -- Gitee From b5e4c851e4fccad492477e9be13b9af18b62cd6b Mon Sep 17 00:00:00 2001 From: lvzk <897706680@qq.com> Date: Mon, 21 Jul 2025 20:31:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BC=A0=E7=9A=84=E5=80=BC=E6=98=AFArrayList?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/autoexec/service/AutoexecJobServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java index 67db9e40..fb08b7fa 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecJobServiceImpl.java @@ -132,6 +132,9 @@ public class AutoexecJobServiceImpl implements AutoexecJobService, IAutoexecJobC for (AutoexecParamVo runtimeParam : runTimeParamList) { if (Objects.equals(value, runtimeParam.getKey())) { if (runtimeParam.getValue() != null) { + if(runtimeParam.getValue() instanceof ArrayList){ + return JSON.toJSONString(runtimeParam.getValue()); + } return runtimeParam.getValue().toString(); } } -- Gitee