From 6853534beda4e0fc81c50f96c691826fbacf18bd Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Fri, 5 Jan 2024 10:43:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-I?= =?UTF-8?q?TSM-CMDB=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9-=E8=B5=B7=E5=A7=8B?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=BA=E6=8A=BD=E8=B1=A1=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=B6=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1062110417616896]后端-ITSM-CMDB同步节点-起始模式为抽象模型时，增加其子模型配置入口 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1062110417616896 --- .../CmdbSyncProcessUtilHandler.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java index 382f8b66..fa5d8535 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java @@ -547,6 +547,34 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { } } } + + JSONArray children = configObj.getChildren(); + if (CollectionUtils.isEmpty(children)) { + continue; + } + for (int i = children.size() - 1; i >= 0; i--) { + JSONObject child = children.getJSONObject(i); + if (MapUtils.isEmpty(child)) { + logger.warn("ciEntityConfig.configList[" + name + "].children[i] is null"); + children.remove(i); + continue; + } + String ciEntityUuid = child.getString("ciEntityUuid"); + if (StringUtils.isBlank(ciEntityUuid)) { + logger.warn("ciEntityConfig.configList[" + name + "].children[i].ciEntityUuid is null"); + throw new CiEntityConfigIllegalException("ciEntityConfig.configList[\" + name + \"].children[i].ciEntityUuid is null"); + } + String ciEntityName = child.getString("ciEntityName"); + if (StringUtils.isBlank(ciEntityName)) { + logger.warn("ciEntityConfig.configList[" + name + "].children[i].ciEntityName is null"); + throw new CiEntityConfigIllegalException("ciEntityConfig.configList[\" + name + \"].children[i].ciEntityName is null"); + } + Long ciId = child.getLong("ciId"); + if (ciId == null) { + logger.warn("ciEntityConfig.configList[" + name + "].children[i].ciId is null"); + throw new CiEntityConfigIllegalException("ciEntityConfig.configList[\" + name + \"].children[i].ciId is null"); + } + } } return ciEntitySyncVo; } -- Gitee From ca63b4672af69b83a774a2d9071f2f49a5a8785c Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Fri, 5 Jan 2024 10:44:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-I?= =?UTF-8?q?TSM-CMDB=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9-=E8=B5=B7=E5=A7=8B?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=BA=E6=8A=BD=E8=B1=A1=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=B6=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1062110417616896]后端-ITSM-CMDB同步节点-起始模式为抽象模型时，增加其子模型配置入口 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1062110417616896 --- .../cmdb/process/dto/CiEntitySyncConfigVo.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncConfigVo.java b/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncConfigVo.java index 7a2e46d7..040655e6 100644 --- a/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncConfigVo.java +++ b/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncConfigVo.java @@ -1,5 +1,7 @@ package neatlogic.module.cmdb.process.dto; +import com.alibaba.fastjson.JSONArray; + import java.util.List; public class CiEntitySyncConfigVo { @@ -21,6 +23,8 @@ public class CiEntitySyncConfigVo { private List mappingList; /** 同步策略，全局模式或局部模式 **/ private String editMode; + /** 子模型配置 **/ + private JSONArray children; public Long getId() { return id; @@ -117,4 +121,12 @@ public class CiEntitySyncConfigVo { public void setEditMode(String editMode) { this.editMode = editMode; } + + public JSONArray getChildren() { + return children; + } + + public void setChildren(JSONArray children) { + this.children = children; + } } -- Gitee From 7e9a492b877fceda37af06428dc1f8dee23d35e0 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Fri, 5 Jan 2024 10:49:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-I?= =?UTF-8?q?TSM-CMDB=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9-=E8=B5=B7=E5=A7=8B?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=BA=E6=8A=BD=E8=B1=A1=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=85=B6=E5=AD=90=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E9=85=8D=E7=BD=AE=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1062110417616896]后端-ITSM-CMDB同步节点-起始模式为抽象模型时，增加其子模型配置入口 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1062110417616896 --- .../process/stephandler/CmdbSyncProcessUtilHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java index fa5d8535..2cc8460d 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java @@ -562,17 +562,17 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { String ciEntityUuid = child.getString("ciEntityUuid"); if (StringUtils.isBlank(ciEntityUuid)) { logger.warn("ciEntityConfig.configList[" + name + "].children[i].ciEntityUuid is null"); - throw new CiEntityConfigIllegalException("ciEntityConfig.configList[\" + name + \"].children[i].ciEntityUuid is null"); + throw new CiEntityConfigIllegalException("ciEntityConfig.configList[" + name + "].children[i].ciEntityUuid is null"); } String ciEntityName = child.getString("ciEntityName"); if (StringUtils.isBlank(ciEntityName)) { logger.warn("ciEntityConfig.configList[" + name + "].children[i].ciEntityName is null"); - throw new CiEntityConfigIllegalException("ciEntityConfig.configList[\" + name + \"].children[i].ciEntityName is null"); + throw new CiEntityConfigIllegalException("ciEntityConfig.configList[" + name + "].children[i].ciEntityName is null"); } Long ciId = child.getLong("ciId"); if (ciId == null) { logger.warn("ciEntityConfig.configList[" + name + "].children[i].ciId is null"); - throw new CiEntityConfigIllegalException("ciEntityConfig.configList[\" + name + \"].children[i].ciId is null"); + throw new CiEntityConfigIllegalException("ciEntityConfig.configList[" + name + "].children[i].ciId is null"); } } } -- Gitee