修改预警事件remark字段生成算法

src/main/java/com/shkpr/service/warncore/bizhandler/CommToolHandler.java

@@ -198,10 +198,10 @@ public class CommToolHandler {
         return code;
     }*/
 
-    public static String genUnionEventRemark(String eventPrefix, String zoneName, String itemName, long sampleDataTime){
+    public static String genUnionEventRemark(String eventPrefix, String zoneName, String objName, String itemName, long sampleDataTime){
         if (StringUtils.isEmpty(zoneName) || StringUtils.isEmpty(itemName) || sampleDataTime <= 0L)
             return "";
-        StringBuilder remark = new StringBuilder(StringUtils.isEmpty(eventPrefix)?String.format("【%s】",zoneName):eventPrefix);
+        StringBuilder remark = new StringBuilder(StringUtils.isEmpty(eventPrefix)?String.format("【%s】%s",zoneName,StringUtils.isEmpty(objName)?"":("--【"+objName+"】")):eventPrefix);
         remark.append("于")
                 .append(TimeTool.convertUTC2DateStr(sampleDataTime, TimeTool.TIMESTAMP_FORMAT))
                 .append("因数据异常，触发了");

src/main/java/com/shkpr/service/warncore/jsonbean/JPOrdWarnEventInfo.java

@@ -4,6 +4,7 @@ import com.global.base.tools.FastJsonUtil;
 import com.global.base.tools.RandomUtil;
 import com.shkpr.service.warncore.bizhandler.CommToolHandler;
 import com.shkpr.service.warncore.commtools.CommTool;
+import com.shkpr.service.warncore.constants.OrdWarnObjSrc;
 import com.shkpr.service.warncore.dto.OrdWarnEventRule;
 import com.shkpr.service.warncore.dto.OrdWarnPlanDetail;
 import com.shkpr.service.warncore.dto.OrdWarnPlanRules;
@@ -84,7 +85,10 @@ public class JPOrdWarnEventInfo {
         this.updateTime = eventTime;
         this.uid = CommTool.genWarnEventId(eventTime, "");
         this.title = String.format("%s--%s--%s事件", planDetail.getTitle(), this.uid.substring(5,15), RandomUtil.getDigitalRandomStr(4));
-        this.remark = CommToolHandler.genUnionEventRemark(eventPrefix, planDetail.getOwner(), planDetail.getItemName(), this.fromTime);
+        this.remark = CommToolHandler.genUnionEventRemark(eventPrefix
+                , planDetail.getOwner()
+                , (!OrdWarnObjSrc.ZONE.equals(rules.get(0).getObjSrc()))?rules.get(0).getObjName():""
+                , planDetail.getItemName(), this.fromTime);
     }
 
     private String formatRule(List<OrdWarnPlanRules> rules){