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 57d344b89bfdaf065bb182e324a59a58b5d987d7..ee861d335e55948aa97dbb01a594f85d1d1ec797 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 2b6401b60dc1c26d89b745de97f7050f06bebf77..6529645d979507de6fa6dd7a25117a64b00d05c7 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 ece687a38f51049829169db3196f765f4c060b70..15a5f69c8a270f5f2ccdd3a6ae6ae3e504d6755c 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 95eb5dff6697ee800e8bfc2a4835e84e862e0cc1..62ddf2bd34008d44ce994513ce7a126a631f10e0 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)) {