大坝监测渗压告警增加明细

xieb

2024-05-24 d271dd871614b2376024a0ece2781399449e8bbc

大坝监测渗压告警增加明细

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java

@@ -347,6 +347,15 @@
        add("val1");
        add("dayNum");
        add("diff_val");
        add("val1");
        add("val2");
        add("val5");
        add("val10");
        add("val30");
        add("diff_2");
        add("diff_5");
        add("diff_10");
        add("diff_30");
    }};

    /**
@@ -361,6 +370,15 @@
        add("val1");
        add("dayNum");
        add("diff_val");
        add("val1");
        add("val2");
        add("val5");
        add("val10");
        add("val30");
        add("diff_2");
        add("diff_5");
        add("diff_10");
        add("diff_30");
    }};

    /**
@@ -375,6 +393,7 @@
        add("sy_val");
        add("type");
        add("diff_val");
        add("lead_val");
    }};

    /**

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

@@ -1006,9 +1006,9 @@
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return map;
                map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
                // 调用短信服务
                return map;
            map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
            // 调用短信服务
            return map;

        }
        return map;
@@ -1035,8 +1035,8 @@

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

        }
    }
@@ -1059,8 +1059,8 @@
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return;
                // 需要合并水库保存站内信记录信息
                noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
            // 需要合并水库保存站内信记录信息
            noticeHandle.saveInStationInfoMerge(smsRequestTemplate, alarmRule);
        }

    }
@@ -1083,9 +1083,9 @@
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return map;
                map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
                // 调用短信服务
                return map;
            map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
            // 调用短信服务
            return map;
        }
        return map;

@@ -1093,7 +1093,7 @@


    //渗压资料缺失
    public Map<String, Object> damSafetySyDataMissingHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyDataMissingHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {

        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
@@ -1108,7 +1108,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1129,7 +1129,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyLessThenPipeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyLessThenPipeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1143,7 +1143,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1164,7 +1164,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyLessThenPipeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyLessThenPipeHandleStation(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);
        // 拼接后面内容
@@ -1176,7 +1176,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1196,7 +1196,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyHigherThenNozzleHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyHigherThenNozzleHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1210,7 +1210,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1231,7 +1231,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyHigherThenNozzleHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyHigherThenNozzleHandleStation(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);
        // 拼接后面内容
@@ -1243,7 +1243,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1262,7 +1262,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyHigherThenBdElevationHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyHigherThenBdElevationHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1276,7 +1276,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1298,7 +1298,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyHigherThenBdElevationHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyHigherThenBdElevationHandleStation(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);
        // 拼接后面内容
@@ -1310,7 +1310,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1330,7 +1330,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyHigherThenWaterLevelHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyHigherThenWaterLevelHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1344,7 +1344,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1366,7 +1366,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyHigherThenWaterLevelHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyHigherThenWaterLevelHandleStation(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);
        // 拼接后面内容
@@ -1378,7 +1378,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1398,7 +1398,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyYellowChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyYellowChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1412,7 +1412,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1434,25 +1434,25 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyYellowChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyYellowChangeHandleStation(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十日测值：{}\n三十日测值：{}\n" +
                        "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n" ,
                    list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),
                    list.get(18),list.get(19),list.get(20),list.get(21)
                    );
                System.out.println(remark);
                        "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
                    list.get(13), list.get(14), list.get(15), list.get(16), list.get(17),
                    list.get(18), list.get(19), list.get(20), list.get(21)
                );
//                System.out.println(remark);
                // 保存告警记录信息
                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")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1472,7 +1472,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyOrangeChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyOrangeChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1497,7 +1497,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1519,7 +1519,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyOrangeChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyOrangeChangeHandleStation(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);
        // 拼接后面内容
@@ -1536,13 +1536,29 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                String remark = StringUtil.format("一日测值：{}\n二日测值：{}\n五日测值：{}\n十日测值：{}\n三十日测值：{}\n" +
                        "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
                    list.get(14), list.get(15), list.get(16), list.get(17), list.get(18),
                    list.get(19), list.get(20), list.get(21), list.get(22)
                );
                list.remove(14);
                list.remove(15);
                list.remove(16);
                list.remove(17);
                list.remove(18);
                list.remove(19);
                list.remove(20);
                list.remove(21);
                list.remove(22);
//                System.out.println(remark);
                // 保存告警记录信息
                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")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1562,7 +1578,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyRedChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyRedChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1580,7 +1596,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1602,7 +1618,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyRedChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyRedChangeHandleStation(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);
        // 拼接后面内容
@@ -1612,13 +1628,28 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                String remark = StringUtil.format("一日测值：{}\n二日测值：{}\n五日测值：{}\n十日测值：{}\n三十日测值：{}\n" +
                        "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
                    list.get(14), list.get(15), list.get(16), list.get(17), list.get(18),
                    list.get(19), list.get(20), list.get(21), list.get(22)
                );
                list.remove(14);
                list.remove(15);
                list.remove(16);
                list.remove(17);
                list.remove(18);
                list.remove(19);
                list.remove(20);
                list.remove(21);
                list.remove(22);
                // 保存告警记录信息
                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")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1637,7 +1668,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetySyRz1hChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetySyRz1hChangeHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1649,13 +1680,14 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                // 保存告警记录信息
                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")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1677,7 +1709,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetySyRz1hChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetySyRz1hChangeHandleStation(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);
        // 拼接后面内容
@@ -1687,13 +1719,20 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                String remark = StringUtil.format("当前测值：{}\n近1H测值：{}\n{}：{}\n",
                    list.get(11), list.get(14), list.get(12), list.get(13)
                );
                // 不拼接短信内容需要删除
                list.remove(14);
                System.out.println(remark);
                // 保存告警记录信息
                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")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1713,7 +1752,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetyWyOver2Less5HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetyWyOver2Less5HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1731,7 +1770,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1753,7 +1792,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetyWyOver2Less5HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetyWyOver2Less5HandleStation(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);
        // 拼接后面内容
@@ -1769,7 +1808,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1789,7 +1828,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetyWyOver5Less10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetyWyOver5Less10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1807,7 +1846,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1829,7 +1868,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetyWyOver5Less10HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetyWyOver5Less10HandleStation(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);
        // 拼接后面内容
@@ -1845,7 +1884,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }
@@ -1865,7 +1904,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public Map<String, Object> damSafetyWyOver10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public Map<String, Object> damSafetyWyOver10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -1883,7 +1922,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1905,7 +1944,7 @@
     * @param uuid            随机生成id
     * @return
     */
    public void damSafetyWyOver10HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid,String isDay) {
    public void damSafetyWyOver10HandleStation(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);
        // 拼接后面内容
@@ -1921,7 +1960,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate, alarmRule);
        }

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

@@ -590,7 +590,7 @@
     */
    public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid) {
        AlarmRecord alarmRecord = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
//            .eq("temp_code", uuid)
            .eq("temp_code", uuid)
            .eq("alarm_rule_id", alarmRule.getId())
            .eq("reservoir_number", list.get(1))
            .eq("alarm_survey_station_code",list.get(0))

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

@@ -1126,6 +1126,7 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_rz_1h_change_api);

        // 处理数据
        JSONArray data = judgeType(ztData);
        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);
@@ -1614,7 +1615,7 @@
            }

            jsonObject.put("type", type);
            jsonObject.put("monitorData",jsonObject.getString("diff_val"));
            jsonObject.put("monitorData",jsonObject.getString("sy_val"));
            array.add(jsonObject);
        }
        return array;