From 47c337de74374d365a178b722fbb95e15375766f Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Wed, 22 Nov 2023 16:34:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98cmdb=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1030280003944448]后端-修改保存cmdb节点逻辑 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1030280003944448 --- .../process/dto/CiEntitySyncMappingVo.java | 7 ++-- .../CmdbSyncProcessUtilHandler.java | 42 +++++++++---------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncMappingVo.java b/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncMappingVo.java index 924b6dbf..b97bea9a 100644 --- a/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncMappingVo.java +++ b/src/main/java/neatlogic/module/cmdb/process/dto/CiEntitySyncMappingVo.java @@ -10,6 +10,7 @@ import java.util.List; public class CiEntitySyncMappingVo { private String key; private String mappingMode; + @Deprecated private String column; private List filterList; private JSONArray valueList; @@ -19,7 +20,7 @@ public class CiEntitySyncMappingVo { public CiEntitySyncMappingVo(CiEntitySyncMappingVo ciEntitySyncMappingVo) { this.key = ciEntitySyncMappingVo.getKey(); this.mappingMode = ciEntitySyncMappingVo.getMappingMode(); - this.column = ciEntitySyncMappingVo.getColumn(); +// this.column = ciEntitySyncMappingVo.getColumn(); List newFilterList = ciEntitySyncMappingVo.getFilterList(); if (CollectionUtils.isNotEmpty(newFilterList)) { this.filterList = new ArrayList<>(); @@ -62,11 +63,11 @@ public class CiEntitySyncMappingVo { public void setMappingMode(String mappingMode) { this.mappingMode = mappingMode; } - + @Deprecated public String getColumn() { return column; } - + @Deprecated public void setColumn(String column) { this.column = column; } 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 46b42b90..99d0ba38 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessUtilHandler.java @@ -444,7 +444,7 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].mappingMode is null"); } JSONArray valueList = mappingVo.getValueList(); - String column = mappingVo.getColumn(); +// String column = mappingVo.getColumn(); List filterList = mappingVo.getFilterList(); if (Objects.equals(mappingMode, "formSubassemblyComponent")) { if (CollectionUtils.isEmpty(valueList)) { @@ -455,10 +455,10 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { logger.warn("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); } - if (StringUtils.isBlank(column)) { - logger.warn("ciEntityConfig.configList[x].mappingList[y].column is null"); - throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].column is null"); - } +// if (StringUtils.isBlank(column)) { +// logger.warn("ciEntityConfig.configList[x].mappingList[y].column is null"); +// throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].column is null"); +// } if (CollectionUtils.isNotEmpty(filterList)) { Iterator filterIterator = filterList.iterator(); while (filterIterator.hasNext()) { @@ -491,10 +491,10 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { logger.warn("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); } - if (StringUtils.isBlank(column)) { - logger.warn("ciEntityConfig.configList[x].mappingList[y].column is null"); - throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].column is null"); - } +// if (StringUtils.isBlank(column)) { +// logger.warn("ciEntityConfig.configList[x].mappingList[y].column is null"); +// throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].column is null"); +// } if (CollectionUtils.isNotEmpty(filterList)) { Iterator filterIterator = filterList.iterator(); while (filterIterator.hasNext()) { @@ -529,19 +529,19 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); } } - if (StringUtils.isNotBlank(column)) { - logger.warn("ciEntityConfig.configList[x].mappingList[y].column is not null"); - mappingVo.setColumn(null); - } +// if (StringUtils.isNotBlank(column)) { +// logger.warn("ciEntityConfig.configList[x].mappingList[y].column is not null"); +// mappingVo.setColumn(null); +// } if (CollectionUtils.isNotEmpty(filterList)) { logger.warn("ciEntityConfig.configList[x].mappingList[y].filterList is not null"); mappingVo.setFilterList(null); } } else if (Objects.equals(mappingMode, "constant")) { - if (StringUtils.isNotBlank(column)) { - logger.warn("ciEntityConfig.configList[x].mappingList[y].column is not null"); - mappingVo.setColumn(null); - } +// if (StringUtils.isNotBlank(column)) { +// logger.warn("ciEntityConfig.configList[x].mappingList[y].column is not null"); +// mappingVo.setColumn(null); +// } if (CollectionUtils.isNotEmpty(filterList)) { logger.warn("ciEntityConfig.configList[x].mappingList[y].filterList is not null"); mappingVo.setFilterList(null); @@ -555,10 +555,10 @@ public class CmdbSyncProcessUtilHandler extends ProcessStepInternalHandlerBase { logger.warn("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); throw new CiEntityConfigIllegalException("ciEntityConfig.configList[x].mappingList[y].valueList[0] is null"); } - if (StringUtils.isNotBlank(column)) { - logger.warn("ciEntityConfig.configList[x].mappingList[y].column is not null"); - mappingVo.setColumn(null); - } +// if (StringUtils.isNotBlank(column)) { +// logger.warn("ciEntityConfig.configList[x].mappingList[y].column is not null"); +// mappingVo.setColumn(null); +// } if (CollectionUtils.isNotEmpty(filterList)) { logger.warn("ciEntityConfig.configList[x].mappingList[y].filterList is not null"); mappingVo.setFilterList(null); -- Gitee