预警规则修改成预警记录生成，站内信在指定时间生效

aix

2024-07-23 4473911c8f1040b72fa91bfe62c7dc247376f9ff

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java

@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import java.time.LocalTime;
import java.util.List;
import java.util.UUID;

@@ -184,6 +185,7 @@
         if (alarmRuleDetailList.size() > 0) {
            // 遍历
            for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
               // 电话，站内信需满足规定时间范围内才发送
               if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                  asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeOverList, true, adCode, true);
               }
@@ -353,9 +355,11 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList1, true, adCode, false, uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
               // 电话，站内信需满足规定时间范围内才发送
//               if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
//                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
//               }
               // 电话，站内信需满足规定时间范围内才发送
               if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                  asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList3, true, adCode, true, uuid);
               }
@@ -389,7 +393,7 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.waterMoreDesignHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterMoreDesignList, true, adCode, false, uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//               if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
//                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreDesignList,true, adCode, false,uuid);
//               }
            }
@@ -423,7 +427,7 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.waterMoreCheckHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterMoreCheckList, true, adCode, false, uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//               if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
//                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterMoreCheckList,true, adCode, false,uuid);
//               }
            }
@@ -606,7 +610,7 @@
               if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                  asyncNoticeHandle.sixHourRainHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.sixHourRainList, false, adCode, false, uuid);
               }
//               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//               if (alarmRuleDetail.getAlarmMode().equals("电话") && isTimeSend()) {
//                  asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.sixHourRainList,true, adCode, false,uuid);
//               }
            }
@@ -1891,4 +1895,6 @@
      }
      return result;
   }


}