告警逻辑修改

guoshilong

2024-04-19 b105f0cdd8d803bce60a9e312eb3e41044562685

告警逻辑修改

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml

@@ -88,8 +88,6 @@
                #{item}
            </foreach>
        </if>

        order by sar.id desc
    </select>

    <select id="getVODetail" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRecordVO">

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

@@ -33,6 +33,7 @@

    /**
     * 1.水位信息接收不到  2. 水位数据异常 需要合并水库的
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -67,6 +68,7 @@

    /**
     * 3.水位超低于死水位
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -113,6 +115,7 @@

    /**
     * 5.水位接近汛限告警--发送站内信
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -155,6 +158,7 @@

    /**
     * 6.水位初次超汛限告警 处理
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -199,6 +203,7 @@

    /**
     * 7.1 水位小幅超汛限告警（发松给 水库技术责任人、巡查责任人）
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -246,6 +251,7 @@

    /**
     * 7.2 水位小幅超汛限告警(发送给 县级水利部门有关人员、主管部门责任人)
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -292,6 +298,7 @@

    /**
     * 8.1 水位大幅超汛限告警（发松给 水库技术责任人、巡查责任人）
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -338,6 +345,7 @@

    /**
     * 8.2 水位大幅超汛限告警(发送给 县级水利部门有关人员、主管部门责任人)
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -428,6 +436,7 @@

    /**
     * 外呼告警信息
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -514,6 +523,7 @@

    /**
     * 10.1 水位超设计洪水位告警处理--短信
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -559,6 +569,7 @@

    /**
     * 10.水位超设计洪水位告警处理 - 电话
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -602,6 +613,7 @@

    /**
     * 11.1 水位超校核洪水位告警--短信
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -647,6 +659,7 @@

    /**
     * 11.2 水位超校核洪水位告警 - 电话
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -689,6 +702,7 @@

    /**
     * 12 近1h水位陡升--短信
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -733,6 +747,7 @@

    /**
     * 13 近1h水位陡降--短信
     *
     * @param alarmRule 告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param ztData 告警数据
@@ -963,6 +978,7 @@
     * @param flag 是否包含日期
     * @param adCode 行政区code用户过滤数据
     * @param isSendStation 是否发送站内信
     * @param isDay           是否每日发送，day
     * @return
     */
    public Map<String, Object> damSafetyHandle(AlarmRule alarmRule,
@@ -972,7 +988,8 @@
                                Boolean flag,
                                String adCode,
                                Boolean isSendStation,
                                String uuid) {
                                               String uuid,
                                               String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -986,14 +1003,17 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
            // 调用短信服务
            return map;

        }
        return map;
    }

    public void damSafetySyHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void damSafetySyHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
            = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
@@ -1011,14 +1031,18 @@
                    list.add(alarmRecord.getId().toString());
                }
            }

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

        }
    }


    //保存记录
    public void damSafetySyNoneHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void damSafetySyNoneHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {

        SmsRequestTemplate smsRequestTemplate
            = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
@@ -1032,6 +1056,8 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return;
            // 需要合并水库保存站内信记录信息
            noticeHandle.saveInStationInfoMerge(smsRequestTemplate,alarmRule);
        }
@@ -1039,7 +1065,7 @@
    }


    public Map<String, Object> damSafetyHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public Map<String, Object> damSafetyHandleSms(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<>();
        // 只发短信，将发短信信息组装好
@@ -1054,6 +1080,8 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsgMergeCd(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1063,11 +1091,8 @@
    }





    //渗压资料缺失
    public Map<String, Object> damSafetySyDataMissingHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    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<>();
        // 只发短信，将发短信信息组装好
@@ -1082,6 +1107,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1091,6 +1117,7 @@

    /**
     * 策略26 短信-----渗压水位低于管底高程
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1101,7 +1128,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) {
    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
@@ -1115,6 +1142,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1124,6 +1152,7 @@

    /**
     * 策略26 站内信-----渗压水位低于管底高程
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1134,7 +1163,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) {
    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);
        // 拼接后面内容
@@ -1146,6 +1175,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
@@ -1154,6 +1184,7 @@

    /**
     * 策略27 短信-----渗压水位高于管口高程
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1164,7 +1195,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) {
    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
@@ -1178,6 +1209,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1187,6 +1219,7 @@

    /**
     * 策略26 站内信-----渗压水位高于管口高程
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1197,7 +1230,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) {
    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);
        // 拼接后面内容
@@ -1209,6 +1242,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
@@ -1216,6 +1250,7 @@

    /**
     * 策略28 短信-----渗压水位高于坝顶高程
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1226,7 +1261,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) {
    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
@@ -1240,6 +1275,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1250,6 +1286,7 @@

    /**
     * 策略28 站内信-----渗压水位高于坝顶高程
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1260,7 +1297,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) {
    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);
        // 拼接后面内容
@@ -1272,6 +1309,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
@@ -1280,6 +1318,7 @@

    /**
     * 策略29 短信-----渗压水位高于库水位
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1290,7 +1329,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) {
    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
@@ -1304,6 +1343,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1314,6 +1354,7 @@

    /**
     * 策略29 站内信-----渗压水位高于库水位
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1324,7 +1365,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) {
    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);
        // 拼接后面内容
@@ -1336,20 +1377,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }








    /**
     * 策略30 短信-----水位长期不变，五日变幅小于5cm，十日变幅大于5cm小于8cm，三十日变幅大于8cm小于10cm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1360,7 +1397,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) {
    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
@@ -1374,6 +1411,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1384,6 +1422,7 @@

    /**
     * 策略30 站内信-----水位长期不变，五日变幅小于5cm，十日变幅大于5cm小于8cm，三十日变幅大于8cm小于10cm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1394,7 +1433,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public void damSafetySyYellowChangeHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    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);
        // 拼接后面内容
@@ -1406,15 +1445,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }



    /**
     * 策略31 短信-----渗压水位一日变幅大于0.5米小于1米，五日变幅大于1米小于2米，十日变幅大于2米小于5米，三十日变幅大于5米小于10米
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1425,7 +1465,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) {
    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
@@ -1450,6 +1490,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1460,6 +1501,7 @@

    /**
     * 策略31 站内信-----渗压水位一日变幅大于0.5米小于1米，五日变幅大于1米小于2米，十日变幅大于2米小于5米，三十日变幅大于5米小于10米
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1470,7 +1512,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) {
    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);
        // 拼接后面内容
@@ -1493,15 +1535,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }



    /**
     * 策略32 短信-----渗压水位一日变幅大于1米小于2米，五日变幅大于2米小于5米，十日变幅大于5米小于10米，三十日变幅大于10米
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1512,7 +1555,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) {
    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
@@ -1530,6 +1573,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1540,6 +1584,7 @@

    /**
     * 策略32 站内信-----渗压水位一日变幅大于1米小于2米，五日变幅大于2米小于5米，十日变幅大于5米小于10米，三十日变幅大于10米
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1550,7 +1595,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) {
    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);
        // 拼接后面内容
@@ -1566,6 +1611,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
@@ -1573,6 +1619,7 @@

    /**
     * 策略33 短信-----近1h水位陡降
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1583,7 +1630,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) {
    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
@@ -1601,6 +1648,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1611,6 +1659,7 @@

    /**
     * 策略33 站内信----- 近1h水位陡降
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1621,7 +1670,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) {
    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);
        // 拼接后面内容
@@ -1637,17 +1686,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }





    /**
     * 策略34 短信-----变形值大于20mm小于50mm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1658,7 +1706,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) {
    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
@@ -1676,6 +1724,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1686,6 +1735,7 @@

    /**
     * 策略34 站内信----- 变形值大于20mm小于50mm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1696,7 +1746,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) {
    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);
        // 拼接后面内容
@@ -1712,16 +1762,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }




    /**
     * 策略35 短信-----变形值大于50mm小于100mm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1732,7 +1782,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) {
    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
@@ -1750,6 +1800,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1760,6 +1811,7 @@

    /**
     * 策略34 站内信----- 变形值大于50mm小于100mm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1770,7 +1822,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) {
    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);
        // 拼接后面内容
@@ -1786,6 +1838,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
@@ -1794,6 +1847,7 @@

    /**
     * 策略34 短信-----变形值大于100mm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1804,7 +1858,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) {
    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
@@ -1822,6 +1876,7 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return map;
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 调用短信服务
            return map;
@@ -1832,6 +1887,7 @@

    /**
     * 策略34 站内信----- 变形值大于100mm
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1842,7 +1898,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) {
    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);
        // 拼接后面内容
@@ -1858,17 +1914,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            if (isDay.equals("day"))return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }





    /**
     * 策略34 短信-----近1h变形值大于10cm以上
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1879,7 +1934,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public Map<String, Object> damSafetyWy1hChangeOver10HandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public Map<String, Object> damSafetyWy1hChangeOver10HandleSms(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
@@ -1897,6 +1952,10 @@
                    list.add(alarmRecord.getId().toString());
                }
            }


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

    /**
     * 策略34 站内信----- 近1h变形值大于10cm以上
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1917,7 +1977,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public void damSafetyWy1hChangeOver10HandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void damSafetyWy1hChangeOver10HandleStation(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);
        // 拼接后面内容
@@ -1933,23 +1993,16 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
    }











    /**
     * 策略34 短信-----渗流值
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1960,7 +2013,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public Map<String, Object> damSafetySlOverLessHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public Map<String, Object> damSafetySlOverLessHandleSms(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
@@ -1978,9 +2031,14 @@
                    list.add(alarmRecord.getId().toString());
                }
            }


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

        }
        return map;
    }
@@ -1988,6 +2046,7 @@

    /**
     * 策略34 站内信----- 渗流值
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -1998,7 +2057,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public void damSafetySlOverLessHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void damSafetySlOverLessHandleStation(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);
        // 拼接后面内容
@@ -2014,6 +2073,8 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
        }
@@ -2021,6 +2082,7 @@

    /**
     * 策略34 站内信----- 资料缺失
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -2031,7 +2093,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public void damSafetySyDataMissingHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void damSafetySyDataMissingHandleStation(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);
        // 拼接后面内容
@@ -2043,6 +2105,8 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return;
            // 保存站内信记录信息
            noticeHandle.saveInStationInfoMergeNoCd(smsRequestTemplate,alarmRule);
        }
@@ -2051,6 +2115,7 @@

    /**
     * 策略34 站内信----- 视频离线
     *
     * @param alarmRule 告警规则
     * @param alarmRuleDetail 告警规则详情
     * @param data 中台数据
@@ -2061,7 +2126,7 @@
     * @param uuid 随机生成id
     * @return
     */
    public void videoOfflineHandleStation(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray data, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void videoOfflineHandleStation(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);
        // 拼接后面内容
@@ -2073,13 +2138,15 @@
                    list.add(alarmRecord.getId().toString());
                }
            }

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

    }

    public void damSafetySyDataMissingHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
    public void damSafetySyDataMissingHandleSms(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid, String isDay) {
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
            = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
@@ -2091,6 +2158,9 @@
                list.add(alarmRecord.getId().toString());
            }
        }

        //如果参数是day，表示是每天生成告警，不需要发信息
        if (isDay.equals("day")) return;
        // 调用短信服务
        smsService.sendMergeSignMsg(smsRequestTemplate);
    }
@@ -2102,7 +2172,8 @@
                                               Boolean flag,
                                               String adCode,
                                               Boolean isSendStation,
                                               String uuid) {
                                                     String uuid,
                                                     String isDay) {
        Map<String, Object> map = new HashMap<>();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
@@ -2116,6 +2187,8 @@
                    list.add(alarmRecord.getId().toString());
                }
            }
            //如果参数是day，表示是每天生成告警，不需要发信息
            if (isDay.equals("day")) return map;
            map = smsService.sendSignMsgMergeCdVideo(smsRequestTemplate);
            // 调用短信服务
            return map;

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

@@ -605,7 +605,7 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);
                    }
                }
            }
@@ -641,7 +641,7 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -676,10 +676,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -712,10 +712,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -748,10 +748,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -786,10 +786,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("短信")){
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, false, uuid,arg2);
                    }
                }
            }
@@ -822,10 +822,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("短信")){
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, false, uuid,arg2);
                    }
                }
            }
@@ -860,10 +860,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -902,10 +902,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, resultData,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid);
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, resultData,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -939,10 +939,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -974,10 +974,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1016,10 +1016,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1055,10 +1055,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1094,10 +1094,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1131,10 +1131,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1170,10 +1170,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1211,10 +1211,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1253,10 +1253,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1293,10 +1293,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1335,10 +1335,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1376,10 +1376,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1417,10 +1417,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid,arg2);
                    }
                }
            }
@@ -1452,10 +1452,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.videoOfflineHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, true, uuid);
                        asyncNoticeHandle.videoOfflineHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, true, uuid,arg2);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.videoOfflineHandleSms(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, false, uuid);
                        asyncNoticeHandle.videoOfflineHandleSms(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.videoOffline, false, adCode, false, uuid,arg2);
                    }

                }

 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmDayXxlJob.java

New file
@@ -0,0 +1,299 @@
package cn.gistack.job.executor.jobhandler;

import cn.gistack.alerts.notice.feign.NoticeClient;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.xxl.job.core.log.XxlJobLogger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

/**
 * 告警定时任务执行器
 * @author zhongrj
 * @date 2023-06-03
 */
@Component
public class AlarmDayXxlJob {

    @Autowired
    private NoticeClient noticeClient;


    /**
     * 策略20: 大坝安全监测告警-测压管水位大于校核洪水位-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyDayHandle")
    public ReturnT<String> damSafetySyHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("测压管水位大于校核洪水位","day","damSafetySyHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略21: 大坝安全监测告警-渗压监测数据缺失-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyNoneDayHandle")
    public ReturnT<String> damSafetySyNoneHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("渗压监测数据缺失","day","damSafetySyNoneHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略22: 大坝安全监测告警-渗流监测数据缺失-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySlNoneDayHandle")
    public ReturnT<String> damSafetySlNoneHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("渗流监测数据缺失","day","damSafetySlNoneHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略23: 大坝安全监测告警-位移监测数据缺失-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetyWyNoneDayHandle")
    public ReturnT<String> damSafetyWyNoneHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("变形监测数据缺失","day","damSafetyWyNoneHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }


    /**
     * 策略24: 大坝安全监测告警-渗压资料缺失-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyDataMissingDayHandle")
    public ReturnT<String> damSafetySyDataMissingHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("渗压资料缺失","day","damSafetySyDataMissingHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略25: 大坝安全监测告警-变形资料缺失-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetyBxDataMissingDayHandle")
    public ReturnT<String> damSafetyBxDataMissingHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("变形资料缺失","day","damSafetyBxDataMissingHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }


    /**
     * 策略26: 大坝安全监测告警-水位低于管底高程-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyLessThenPipeDayHandle")
    public ReturnT<String> damSafetySyLessThenPipeHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("水位低于管底高程","day","damSafetySyLessThenPipeHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略27: 大坝安全监测告警-水位大于管口高程-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyHigherThenNozzleDayHandle")
    public ReturnT<String> damSafetySyHigherThenNozzleHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("水位大于管口高程","day","damSafetySyHigherThenNozzleHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略28: 大坝安全监测告警-水位大于坝顶高程-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyHigherThenBdElevationDayHandle")
    public ReturnT<String> damSafetySyHigherThenBdElevationHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("水位大于坝顶高程","day","damSafetySyHigherThenBdElevationHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略29: 大坝安全监测告警-水位大于库水位-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyHigherThenWaterLevelDayHandle")
    public ReturnT<String> damSafetySyHigherThenWaterLevelHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("水位大于库水位","day","damSafetySyHigherThenWaterLevelHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }


    /**
     * 策略30: 大坝安全监测告警-水位长期不变，五日变幅小于5cm，十日变幅大于5cm小于8cm，三十日变幅大于8cm小于10cm-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyYellowChangeDayHandle")
    public ReturnT<String> damSafetySyYellowChangeHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("水位变幅黄色告警","day","damSafetySyYellowChangeHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略31: 大坝安全监测告警-渗压水位一日变幅大于0.5米小于1米，五日变幅大于1米小于2米，十日变幅大于2米小于5米，三十日变幅大于5米小于10米-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySyOrangeChangeDayHandle")
    public ReturnT<String> damSafetySyOrangeChangeHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("水位变幅橙色告警","day","damSafetySyOrangeChangeHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略34: 大坝安全监测告警-变形值大于2cm小于5cm-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetyWyOver2Less5DayHandle")
    public ReturnT<String> damSafetyWyOver2Less5Handle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("变形值大于2cm小于5cm","day","damSafetyWyOver2Less5Handle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }


    /**
     * 策略35: 大坝安全监测告警-变形值大于5cm小于10cm-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetyWyOver5Less10DayHandle")
    public ReturnT<String> damSafetyWyOver5Less10Handle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("变形值大于5cm小于10cm","day","damSafetyWyOver5Less10Handle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略38: 大坝安全监测告警-渗流量一日大于5L小于8L，连续3日增加-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySlOver5Less8DayHandle")
    public ReturnT<String> damSafetySlOver5Less8Handle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("渗流量一日大于5L小于8L连续3日增加","day","damSafetySlOver5Less8Handle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略39: 大坝安全监测告警-渗流量一日大于8L小于10L，连续3日增加-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("damSafetySlOver8Less10DayHandle")
    public ReturnT<String> damSafetySlOver8Less10Handle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("渗流量一日大于8L小于10L连续3日增加","day","damSafetySlOver8Less10Handle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }

    /**
     * 策略41: 视频告警-视频信息接收不到-定时任务执行器
     * @param param
     * @return
     * @throws Exception
     */
    @XxlJob("videoOfflineDayHandle")
    public ReturnT<String> videoOfflineHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("视频信息接收不到","day","videoOfflineHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;
    }


}

 skjcmanager/skjcmanager-service/skjcmanager-xxljob/src/main/java/cn/gistack/job/executor/jobhandler/AlarmXxlJob.java

@@ -383,7 +383,7 @@
    public ReturnT<String> damSafetyWyNoneHandle(String param){
        XxlJobLogger.log("开始执行任务...");
        // 创建外呼任务
        noticeClient.createAlarmNoticeTaskJobHandler("位移监测数据缺失","","damSafetyWyNoneHandle");
        noticeClient.createAlarmNoticeTaskJobHandler("变形监测数据缺失","","damSafetyWyNoneHandle");
        XxlJobLogger.log("结束自动创建任务...");
        // 返回
        return ReturnT.SUCCESS;