预警规则新增widget和ranges

预警事件新增objId

src/main/java/com/shkpr/service/warncore/dto/CommUNSBean.java

@@ -0,0 +1,14 @@
+package com.shkpr.service.warncore.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class CommUNSBean {
+    private String value = "";
+    private String name = "";
+
+    public CommUNSBean() {
+    }
+}

src/main/java/com/shkpr/service/warncore/dto/OrdWarnRuleCondition.java

@@ -3,6 +3,8 @@ package com.shkpr.service.warncore.dto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 @Getter
 @Setter
 public class OrdWarnRuleCondition {
@@ -13,6 +15,8 @@ public class OrdWarnRuleCondition {
     private String threshold = "";//对比字段待对比阀值
     private String type = "";//对比字段的取值类型
     private String format = "";//实际查询字段@实际返回字段
+    private String widget = "";
+    private List<CommUNSBean> ranges = null;
 
     public OrdWarnRuleCondition() {
     }

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

@@ -46,6 +46,7 @@ public class JPOrdWarnEventInfo {
     private int sendway = 3;
     private String planBatch = "";
     private String remark = "";
+    private String objId = "";
 
     public JPOrdWarnEventInfo() {
     }
@@ -63,6 +64,7 @@ public class JPOrdWarnEventInfo {
         this.ending = planDetail.getEnding();
         this.planBatch = planDetail.getBatch();
         this.gis = CommTool.listSize(rules)>0?rules.get(0).getObjGis():"";
+        this.objId = CommTool.listSize(rules)>0?rules.get(0).getObjId():"";
         if (StringUtils.isEmpty(this.gis))
             this.gis = planDetail.getOwnerGis();
         this.followerId = planDetail.getZoneMgrId();

src/main/resources/application.properties

@@ -128,8 +128,8 @@ cron.check.minute.warn=20 0/1 * * * ?
 cron.check.hour.warn=0 40 * * * ?
 #\u6BCF\u592920:00:00\u6267\u884C\u4E00\u6B21
 cron.check.day.warn=0 00 20 * * ?
-#\u6BCF\u670826\u65E5\u768401:00:00\u6267\u884C\u4E00\u6B21
-cron.check.month.warn=0 0 1 26 * ?
+#\u6BCF\u670827\u65E5\u768401:00:00\u6267\u884C\u4E00\u6B21
+cron.check.month.warn=0 0 1 27 * ?
 
 #\u4E07\u7EF4\u7F51\u8BBF\u95EE\u7684\u4EE3\u7406\u5730\u5740(\u4E3A\u7A7A\u65F6\uFF0C\u8BBF\u95EE\u4E07\u7EF4\u7F51\u4E0D\u4F7F\u7528\u4EE3\u7406)
 global.www.proxy.address=