From c110bd007bbda014f313ee8b28e5392487067848 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 18 Mar 2025 20:33:36 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1379868489515008]应用配置中流水线导入失败 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1379868489515008 --- .../handler/ProfileImportExportHandler.java | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/main/java/neatlogic/module/autoexec/importexport/handler/ProfileImportExportHandler.java b/src/main/java/neatlogic/module/autoexec/importexport/handler/ProfileImportExportHandler.java index 4116f597..b82023fc 100644 --- a/src/main/java/neatlogic/module/autoexec/importexport/handler/ProfileImportExportHandler.java +++ b/src/main/java/neatlogic/module/autoexec/importexport/handler/ProfileImportExportHandler.java @@ -19,9 +19,13 @@ import com.alibaba.fastjson.JSONObject; import neatlogic.framework.autoexec.constvalue.AutoexecImportExportHandlerType; import neatlogic.framework.autoexec.constvalue.ParamMappingMode; import neatlogic.framework.autoexec.constvalue.ToolType; +import neatlogic.framework.autoexec.dao.mapper.AutoexecScriptMapper; +import neatlogic.framework.autoexec.dao.mapper.AutoexecToolMapper; import neatlogic.framework.autoexec.dto.AutoexecOperationVo; +import neatlogic.framework.autoexec.dto.AutoexecToolVo; import neatlogic.framework.autoexec.dto.profile.AutoexecProfileParamVo; import neatlogic.framework.autoexec.dto.profile.AutoexecProfileVo; +import neatlogic.framework.autoexec.dto.script.AutoexecScriptVo; import neatlogic.framework.autoexec.exception.AutoexecProfileIsNotFoundException; import neatlogic.framework.dependency.core.DependencyManager; import neatlogic.framework.importexport.core.ImportExportHandlerBase; @@ -49,6 +53,12 @@ public class ProfileImportExportHandler extends ImportExportHandlerBase { @Resource private AutoexecProfileService autoexecProfileService; + @Resource + private AutoexecToolMapper autoexecToolMapper; + + @Resource + private AutoexecScriptMapper autoexecScriptMapper; + @Override public ImportExportHandlerType getType() { return AutoexecImportExportHandlerType.AUTOEXEC_PROFILE; @@ -105,11 +115,27 @@ public class ProfileImportExportHandler extends ImportExportHandlerBase { Object newPrimaryKey = getNewPrimaryKey(AutoexecImportExportHandlerType.AUTOEXEC_SCRIPT, autoexecOperationVo.getId(), primaryChangeList); if (newPrimaryKey != null) { autoexecOperationVo.setId((Long) newPrimaryKey); + } else { + AutoexecScriptVo scriptVo = autoexecScriptMapper.getScriptBaseInfoById(autoexecOperationVo.getId()); + if (scriptVo == null) { + scriptVo = autoexecScriptMapper.getScriptBaseInfoByName(autoexecOperationVo.getName()); + if (scriptVo != null) { + autoexecOperationVo.setId(scriptVo.getId()); + } + } } } else if (Objects.equals(autoexecOperationVo.getType(), ToolType.TOOL.getValue())) { Object newPrimaryKey = getNewPrimaryKey(AutoexecImportExportHandlerType.AUTOEXEC_TOOL, autoexecOperationVo.getId(), primaryChangeList); if (newPrimaryKey != null) { autoexecOperationVo.setId((Long) newPrimaryKey); + } else { + AutoexecToolVo toolVo = autoexecToolMapper.getToolById(autoexecOperationVo.getId()); + if (toolVo == null) { + toolVo = autoexecToolMapper.getToolByName(autoexecOperationVo.getName()); + if (toolVo != null) { + autoexecOperationVo.setId(toolVo.getId()); + } + } } } } @@ -152,8 +178,16 @@ public class ProfileImportExportHandler extends ImportExportHandlerBase { if (CollectionUtils.isNotEmpty(autoexecOperationVoList)) { for (AutoexecOperationVo autoexecOperationVo : autoexecOperationVoList) { if (Objects.equals(autoexecOperationVo.getType(), ToolType.SCRIPT.getValue())) { + AutoexecScriptVo scriptVo = autoexecScriptMapper.getScriptBaseInfoById(autoexecOperationVo.getId()); + if (scriptVo != null) { + autoexecOperationVo.setName(scriptVo.getName()); + } doExportData(AutoexecImportExportHandlerType.AUTOEXEC_SCRIPT, autoexecOperationVo.getId(), dependencyList, zipOutputStream); } else if (Objects.equals(autoexecOperationVo.getType(), ToolType.TOOL.getValue())) { + AutoexecToolVo toolVo = autoexecToolMapper.getToolById(autoexecOperationVo.getId()); + if (toolVo != null) { + autoexecOperationVo.setName(toolVo.getName()); + } doExportData(AutoexecImportExportHandlerType.AUTOEXEC_TOOL, autoexecOperationVo.getId(), dependencyList, zipOutputStream); } } -- Gitee