From 78765b2c5227ef6ef0124270dcd3a912045683f4 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Fri, 10 Nov 2023 15:14:11 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1021667940204544]屏蔽配置项同步节点 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1021667940204544 --- .../notifyhandler/CiEntitySyncNotifyHandler.java | 3 +-- .../CIEntitySyncProcessUtilHandler.java | 9 ++++----- .../CiEntitySyncProcessComponent.java | 3 +-- .../stephandler/CmdbSyncProcessComponent.java | 16 +++++++++++++--- 4 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java index 57d344b8..ee861d33 100644 --- a/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/notifyhandler/CiEntitySyncNotifyHandler.java @@ -10,11 +10,10 @@ import neatlogic.framework.notify.dto.NotifyTriggerTemplateVo; import neatlogic.framework.notify.dto.NotifyTriggerVo; import neatlogic.framework.process.notify.constvalue.ProcessNotifyPolicyHandlerGroup; import neatlogic.module.cmdb.process.stephandler.CmdbProcessStepHandlerType; -import org.springframework.stereotype.Component; import java.util.List; -@Component +//@Component public class CiEntitySyncNotifyHandler extends NotifyPolicyHandlerBase { @Override diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java index 2b6401b6..6529645d 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CIEntitySyncProcessUtilHandler.java @@ -1,29 +1,28 @@ package neatlogic.module.cmdb.process.stephandler; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; import neatlogic.framework.crossover.CrossoverServiceFactory; import neatlogic.framework.notify.crossover.INotifyServiceCrossoverService; +import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.constvalue.ProcessTaskOperationType; import neatlogic.framework.process.dto.ProcessStepVo; import neatlogic.framework.process.dto.ProcessStepWorkerPolicyVo; import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.dto.processconfig.ActionConfigActionVo; import neatlogic.framework.process.dto.processconfig.ActionConfigVo; -import neatlogic.framework.notify.dto.InvokeNotifyPolicyConfigVo; import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerBase; import neatlogic.framework.process.util.ProcessConfigUtil; import neatlogic.module.cmdb.process.notifyhandler.CiEntitySyncNotifyHandler; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Objects; -@Service +//@Service public class CIEntitySyncProcessUtilHandler extends ProcessStepInternalHandlerBase { @Override diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java index ece687a3..15a5f69c 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java @@ -47,14 +47,13 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -@Service +//@Service public class CiEntitySyncProcessComponent extends ProcessStepHandlerBase { static Logger logger = LoggerFactory.getLogger(CiEntitySyncProcessComponent.class); diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java index 95eb5dff..62ddf2bd 100644 --- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java +++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java @@ -302,7 +302,11 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { // 增加提醒 logger.error(s.getError(), s.getException()); JSONObject errorMessageObj = new JSONObject(); - errorMessageObj.put("error", s.getError()); + String error = s.getError(); + if (error == null) { + error = "null"; + } + errorMessageObj.put("error", error); errorMessageList.add(errorMessageObj); JSONObject dataObj = new JSONObject(); dataObj.put("time", System.currentTimeMillis()); @@ -317,7 +321,11 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { // 增加提醒 logger.error(e.getMessage(), e); JSONObject errorMessageObj = new JSONObject(); - errorMessageObj.put("error", e.getMessage()); + String error = e.getMessage(); + if (error == null) { + error = "null"; + } + errorMessageObj.put("error", error); errorMessageList.add(errorMessageObj); JSONObject dataObj = new JSONObject(); dataObj.put("time", System.currentTimeMillis()); @@ -652,7 +660,9 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase { list.add(ciId.toString()); for (Long attrId : uniqueAttrIdList) { JSONArray valueList = key2ValueListMap.get("attr_" + attrId); - list.add(valueList.toJSONString()); + if (valueList != null) { + list.add(valueList.toJSONString()); + } } String uniqueAttrValueListJoinStr = String.join(",", list); if (uniqueAttrValueListJoinStrList.contains(uniqueAttrValueListJoinStr)) { -- Gitee