错误修正

zrj

2024-08-22 4fa63d4db1e87adabe5b40a4d5fb4e8b10276def

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

@@ -16,6 +16,7 @@
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;

import java.time.LocalTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,6 +64,9 @@
            list.add(alarmRecord.getId().toString());
         }
      }

      if (!isTimeSend()) return;

      // 调用短信服务
      smsService.sendMergeSignMsg(smsRequestTemplate);
   }
@@ -99,12 +103,22 @@
            // 后面依次拼接市县水利部门人员姓名电话
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n死水位：{}米\n超低于死水位：{}米\n",
               list.get(9),
               String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(10))),
               list.get(10)
            );
            list.remove(10);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }

         if (!isTimeSend()) return map;
         // 调用短信服务
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 返回
@@ -145,12 +159,20 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n接近汛限水位：{}米\n",
               list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
            );
            list.remove(13);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }

         if(!isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -189,12 +211,21 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
               list.get(9), list.get(11), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(11)))
            );
            list.remove(11);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }

         if (!isTimeSend()) return map;

         // 调用短信服务
         map = smsService.sendSignMsg(smsRequestTemplate);
         return map;
@@ -237,12 +268,19 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
               list.get(9), list.get(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
            );
            list.remove(12);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         // 调用短信服务
         map = smsService.sendSignMsg(smsRequestTemplate);
         return map;
@@ -284,12 +322,19 @@
            noticeHandle.addPatrolTechnologyInfo(list, true);
            // 拼接市县水利部人员姓名及联系方式
//            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
               list.get(9), list.get(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
            );
            list.remove(12);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         // 调用短信服务
         map = smsService.sendSignMsg(smsRequestTemplate);
         return map;
@@ -331,12 +376,19 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
               list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
            );
            list.remove(13);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         // 调用短信服务
         map = smsService.sendSignMsg(smsRequestTemplate);
         return map;
@@ -376,14 +428,21 @@
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 依次拼接巡查责任人，技术责任人姓名联系电话
            noticeHandle.addPatrolTechnologyInfo(list, true);

            String remark = StringUtil.format("水位：{}\n汛限水位：{}米\n超汛限水位：{}米\n",
               list.get(9), list.get(12), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(12)))
            );
            list.remove(12);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         // 调用短信服务
         map = smsService.sendSignMsg(smsRequestTemplate);
//         map = smsService.sendSignMsg(smsRequestTemplate);
         return map;
      }
      return map;
@@ -428,6 +487,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -464,13 +524,18 @@
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
//            noticeHandle.addCityCountyBusinessPersonInfo(list);
            String remark = StringUtil.format("降雨：{}\n",
               list.get(6) + "毫米"
            );
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }

         if(!isTimeSend()) return map;
         List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
         map.put("list", list);
         // 调用短信服务
@@ -517,6 +582,8 @@
               list.add(alarmRecord.getId().toString());
            }
         }

         if (!isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -551,16 +618,25 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {


            String remark = StringUtil.format("水位：{}\n设计洪水位：{}米\n超设计洪水位：{}米\n",
               list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
            );
            list.remove(13);

//            System.out.println(remark);
            // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
            noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -605,6 +681,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -641,16 +718,23 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
            noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("水位：{}\n校核洪水位：{}米\n{}米\n",
               list.get(9), list.get(10), list.get(11)
            );

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -694,6 +778,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -731,14 +816,22 @@
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 依次添加行巡查责任人,技术责任人信息(姓名)
            noticeHandle.addPatrolTechnologyInfo(list, false);
//            // 依次添加行巡查责任人,技术责任人信息,主管部门责任人(姓名)
//            noticeHandle.addPatrolTechnologyInfoNew(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("近1h水位陡升：{}\n",
               list.get(10)
            );

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -774,16 +867,23 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            // 依次添加行巡查责任人,技术责任人信息(姓名)
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
//            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("近1h水位陡降：{}\n",
               list.get(10)
            );

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -819,16 +919,20 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            // 依次添加巡查责任人技术责任人信息姓名
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = list.get(9);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -864,16 +968,21 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            // 依次添加巡查责任人技术责任人信息姓名
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = list.get(9);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -910,15 +1019,23 @@
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
            noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
//            noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
            // 主管部门责任人,技术责任人,巡查责任人信息 2024-05-29修改
            noticeHandle.addWaterMoreDesignPatrolTechnologyInfoNew(list, "2,4,5");
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("降雨：{}\n",
               list.get(6) + "毫米"
            );

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -962,6 +1079,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (!isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1005,7 +1123,7 @@
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1034,7 +1152,7 @@
         }

         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);

@@ -1058,7 +1176,7 @@
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 需要合并水库保存站内信记录信息
         noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
      }
@@ -1082,7 +1200,7 @@
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1108,7 +1226,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1137,13 +1255,18 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            String remark = StringUtil.format("渗压水位：{}\n管底高程：{}\n",
               list.get(3), String.format("%.2f", Double.valueOf(list.get(11)) + Double.valueOf(list.get(12)))
            );
//            System.out.println(remark);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1170,13 +1293,18 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            String remark = StringUtil.format("渗压水位：{}\n管底高程：{}\n",
               list.get(3), String.format("%.2f", Double.valueOf(list.get(11)) + Double.valueOf(list.get(12)))
            );
//            System.out.println(remark);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1204,14 +1332,18 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            String remark = StringUtil.format("渗压水位：{}\n管口高程：{}\n",
               list.get(11), list.get(12)
            );
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         if (isDay.equals("day") || !isTimeSend()) return map;
//         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
      }
@@ -1237,13 +1369,17 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            String remark = StringUtil.format("渗压水位：{}\n管口高程：{}\n",
               list.get(11), list.get(12)
            );
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1276,7 +1412,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1304,13 +1440,19 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            String remark = StringUtil.format("渗压水位：{}\n坝顶高程：{}\n",
               list.get(11), list.get(13)
            );
            list.remove(13);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1344,7 +1486,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1372,13 +1514,17 @@
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {

            String remark = StringUtil.format("渗压水位：{}\n库水位：{}\n",
               list.get(11), list.get(12)
            );
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1412,7 +1558,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1452,7 +1598,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1497,7 +1643,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1558,7 +1704,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1596,7 +1742,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1649,7 +1795,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1687,7 +1833,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1732,7 +1878,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1770,7 +1916,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1800,15 +1946,24 @@
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 依次添加行巡查责任人,技术责任人信息(姓名)
            noticeHandle.addPatrolTechnologyInfo(list, false);

            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
            list.remove(14);
            list.remove(15);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1846,7 +2001,7 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1878,13 +2033,21 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
            list.remove(14);
            list.remove(15);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -1916,13 +2079,21 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
            list.remove(14);
            list.remove(15);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -1954,13 +2125,21 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("上下游：{}\n左右岸：{}\n垂直位移：{}\n",
               list.get(13), list.get(14), list.get(15)
            );
            list.remove(13);
            list.remove(14);
            list.remove(15);

            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -2001,7 +2180,7 @@


         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -2040,7 +2219,7 @@
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -2080,7 +2259,7 @@


         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
@@ -2113,14 +2292,20 @@
            noticeHandle.addPatrolTechnologyInfo(list, false);
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);

            String remark = StringUtil.format("当前：{}\n一日：{}\n二日：{}\n",
               list.get(11), list.get(12), list.get(13)
            );
            list.remove(12);
            list.remove(13);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
@@ -2152,7 +2337,7 @@
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate, alarmRule);
      }
@@ -2186,7 +2371,7 @@
         }

         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return;
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfoMergeVideo(smsRequestTemplate, alarmRule);
      }
@@ -2206,7 +2391,7 @@
      }

      //如果参数是day，表示是每天生成告警，不需要发信息
      if (isDay.equals("day")) return;
      if (isDay.equals("day") || !isTimeSend()) return;
      // 调用短信服务
      smsService.sendMergeSignMsg(smsRequestTemplate);
   }
@@ -2234,11 +2419,81 @@
            }
         }
         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day")) return map;
         if (isDay.equals("day") || !isTimeSend()) return map;
         map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
         // 调用短信服务
         return map;
      }
      return map;
   }

   /**
    * 策略42 站内信----- 超防洪高水位告警
    *
    * @param alarmRule       告警规则
    * @param alarmRuleDetail 告警规则详情
    * @param ztData            中台数据
    * @param columnList      需要展示的数据字段
    * @param flag            是否显示日期
    * @param adCode          行政区划
    * @param isSendStation   是否站内信
    * @param uuid            随机生成id
    * @return
    */
   public void topLevOfFloAlertHandleStation(AlarmRule alarmRule,
                                   AlarmRuleDetail alarmRuleDetail,
                                   JSONArray data,
                                   List<String> columnList,
                                   boolean flag,
                                   String adCode,
                                   boolean isSendStation,
                                   String uuid,
                                   String isDay
   ) {
      SmsRequestTemplate smsRequestTemplate
         = noticeHandle.getSendSmsTemplate(data, alarmRule, alarmRuleDetail, columnList, flag, adCode, uuid, isSendStation);
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            String remark = StringUtil.format("水位：{}\n防洪高水位：{}米\n超防洪高水位：{}米\n",
               list.get(9), list.get(13), String.format("%.2f", Double.valueOf(list.get(9).replace("米", "")) - Double.valueOf(list.get(13)))
            );
            list.remove(13);
            System.out.println(remark);
            // 依次添加行政责任人,主管部门责任人,技术责任人,巡查责任人信息(姓名，联系电话)
            noticeHandle.addWaterMoreDesignPatrolTechnologyInfo(list, "1,2,4,5");
            // 拼接市县水利部人员姓名及联系方式
            noticeHandle.addCityCountyBusinessPersonInfo(list);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid,remark);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }

         //如果参数是day，表示是每天生成告警，不需要发信息
         if (isDay.equals("day") || !isTimeSend()) return;
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
      }
   }

   /**
    * 是否在时间范围内发送
    * @return
    */
   private boolean isTimeSend(){
      boolean flag = false;
      // 判断时间范围
      // 开始时间
      LocalTime startTime = LocalTime.parse("08:00");
      // 结束时间
      LocalTime endTime = LocalTime.parse("22:00");
      // 当前时间
      LocalTime now = LocalTime.now();
      // 比较
      flag = !now.isBefore(startTime) && !now.isAfter(endTime);
      // 返回
      return flag;
   }
}