From 29776bf336070d4a79f322b8d966c42b3e62401a Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 16 Dec 2024 11:53:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96-=E6=9C=8D=E5=8A=A1=E7=9B=AE=E5=BD=95-=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=9B=AE=E6=A0=87=E6=98=A0=E5=B0=84=E5=88=B0=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=96=87=E6=9C=AC=E6=A1=86=E7=BB=84=E4=BB=B6=E6=97=B6?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BD=9C=E4=B8=9A=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1312926642700288]自动化-服务目录-执行目标映射到表单文本框组件时创建作业报错 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1312926642700288 --- .../autoexec/api/combop/AutoexecCombopDetailGetApi.java | 4 ++-- .../module/autoexec/process/util/CreateJobConfigUtil.java | 2 +- .../module/autoexec/service/AutoexecServiceServiceImpl.java | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java index 223b7a56..1a102bac 100644 --- a/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java +++ b/src/main/java/neatlogic/module/autoexec/api/combop/AutoexecCombopDetailGetApi.java @@ -27,7 +27,7 @@ import neatlogic.framework.autoexec.dto.combop.AutoexecCombopConfigVo; import neatlogic.framework.autoexec.dto.combop.AutoexecCombopVersionConfigVo; import neatlogic.framework.autoexec.dto.combop.AutoexecCombopVersionVo; import neatlogic.framework.autoexec.dto.combop.AutoexecCombopVo; -import neatlogic.framework.autoexec.exception.combop.AutoexecCombopNotFoundEditTargetException; +import neatlogic.framework.autoexec.exception.AutoexecCombopNotFoundException; import neatlogic.framework.autoexec.exception.combop.AutoexecCombopVersionNotFoundEditTargetException; import neatlogic.framework.common.constvalue.ApiParamType; import neatlogic.framework.restful.annotation.*; @@ -74,7 +74,7 @@ public class AutoexecCombopDetailGetApi extends PrivateApiComponentBase { Long versionId = paramObj.getLong("versionId"); AutoexecCombopVo autoexecCombopVo = autoexecCombopService.getAutoexecCombopById(id); if (autoexecCombopVo == null) { - throw new AutoexecCombopNotFoundEditTargetException(id); + throw new AutoexecCombopNotFoundException(id); } AutoexecTypeVo autoexecTypeVo = autoexecTypeMapper.getTypeById(autoexecCombopVo.getTypeId()); if (autoexecTypeVo != null) { 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 b279d535..9a569d41 100644 --- a/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java +++ b/src/main/java/neatlogic/module/autoexec/process/util/CreateJobConfigUtil.java @@ -432,7 +432,7 @@ public class CreateJobConfigUtil { return null; } - private static AutoexecCombopExecuteNodeConfigVo getExecuteNodeConfig(JSONArray jsonArray) { + public static AutoexecCombopExecuteNodeConfigVo getExecuteNodeConfig(JSONArray jsonArray) { if (CollectionUtils.isEmpty(jsonArray)) { return null; } diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java index b0fc9240..54b145e6 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecServiceServiceImpl.java @@ -38,6 +38,7 @@ import neatlogic.framework.util.$; import neatlogic.framework.util.FormUtil; import neatlogic.module.autoexec.dao.mapper.AutoexecCombopVersionMapper; import neatlogic.module.autoexec.process.dto.AutoexecJobBuilder; +import neatlogic.module.autoexec.process.util.CreateJobConfigUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; @@ -640,7 +641,9 @@ public class AutoexecServiceServiceImpl implements AutoexecServiceService { } else if (Objects.equals(executeNodeParamMappingVo.getMappingMode(), ServiceParamMappingMode.FORMATTR.getValue())) { Object value = formAttributeDataMap.get(executeNodeParamMappingVo.getValue()); if (value != null) { - AutoexecCombopExecuteNodeConfigVo executeNodeConfigVo = JSONObject.toJavaObject((JSONObject) value, AutoexecCombopExecuteNodeConfigVo.class); + JSONArray jsonArray = new JSONArray(); + jsonArray.add(value); + AutoexecCombopExecuteNodeConfigVo executeNodeConfigVo = CreateJobConfigUtil.getExecuteNodeConfig(jsonArray); executeConfigVo.setExecuteNodeConfig(executeNodeConfigVo); } } -- Gitee