解决0分时刻、0点时刻无法正常分析的bug

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

@@ -145,13 +145,13 @@ public class CommToolHandler {
         return code;
     }
 
-    public static String genUnionEventRemark(String zoneName, String itemName, long eventTime){
-        if (StringUtils.isEmpty(zoneName) || StringUtils.isEmpty(itemName) || eventTime <= 0L)
+    public static String genUnionEventRemark(String zoneName, String itemName, long sampleDataTime){
+        if (StringUtils.isEmpty(zoneName) || StringUtils.isEmpty(itemName) || sampleDataTime <= 0L)
             return "";
         StringBuilder remark = new StringBuilder(zoneName);
         remark.append("于")
-                .append(TimeTool.convertUTC2DateStr(eventTime, TimeTool.TIMESTAMP_FORMAT))
-                .append("发生了");
+                .append(TimeTool.convertUTC2DateStr(sampleDataTime, TimeTool.TIMESTAMP_FORMAT))
+                .append("因数据异常，触发了");
         String arrItemName[] = itemName.split("--");
         if (arrItemName != null && arrItemName.length >= 2){
             if (arrItemName[0].equals(arrItemName[1])){

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

@@ -33,15 +33,17 @@ public class TimerCheckWarnPlanMgr {
         int curTmForCompare = 1;
         String tmFiler = "";
         if (FrequencyUnit.MIN.equals(frequencyUnit)){
-            curTmForCompare = curMinute;
-            String.format("and %s <= %d "
+            if (curMinute > 0)//0分时刻不做判断默认执行
+                curTmForCompare = curMinute;
+            /*tmFiler = String.format("and %s <= %d "
                     , OrdWarnPlanInfoTable.W_INFO.FREQUENCY
-                    , curTmForCompare);
+                    , curTmForCompare);*/
         }else if (FrequencyUnit.HOUR.equals(frequencyUnit)){
-            curTmForCompare = curClock;
-            String.format("and %s <= %d "
+            if (curClock > 0)//0点时刻不做判断默认执行
+                curTmForCompare = curClock;
+            /*tmFiler = String.format("and %s <= %d "
                     , OrdWarnPlanInfoTable.W_INFO.FREQUENCY
-                    , curTmForCompare);
+                    , curTmForCompare);*/
         }
 
         long thisDayBegin = TimeTool.getTodayBeginUTC();

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

@@ -80,7 +80,7 @@ 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(planDetail.getOwner(), planDetail.getItemName(), eventTime);
+        this.remark = CommToolHandler.genUnionEventRemark(planDetail.getOwner(), planDetail.getItemName(), this.fromTime);
     }
 
     private String formatRule(List<OrdWarnPlanRules> rules){