不告警水库过滤

guoshilong

2024-04-16 f23949cc3f7f8c264f919f77e0a21521eecde15e

不告警水库过滤

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/feign/IMessageClient.java

@@ -25,6 +25,8 @@
    String GET_NOT_READ_NUMBER = API_PREFIX + "/getNotReadNumber";
    String GET_NOT_READ_LIST = API_PREFIX + "/getNotReadList";

    String GET_NO_ALERT_RES_LIST = API_PREFIX + "/getNoAlertResList";

    /**
     * 保存站内信记录信息
     * @param messageRecord
@@ -49,4 +51,7 @@
     */
    @GetMapping(GET_NOT_READ_LIST)
    List<MessageRecord> getNotReadList(@RequestParam("userId")String userId);

    @GetMapping(GET_NO_ALERT_RES_LIST)
    String getNoAlertRes(@RequestParam("ruleName") String ruleName);
}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/message/feign/IMessageClientFallback.java

@@ -27,4 +27,9 @@
    public List<MessageRecord> getNotReadList(String userId) {
        return null;
    }

    @Override
    public String getNoAlertRes(String ruleName) {
        return null;
    }
}

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

@@ -173,7 +173,6 @@
//                jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
                jointDataV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, uuid, set);
            }
            log.info("告警人员信息：{}", personLists.toString());
        }
        // 设置信息
        smsRequestTemplate.setPersonVOList(personLists);
@@ -764,7 +763,6 @@
            messageRecord.setSender(AuthUtil.getUserId().toString());
            messageRecord.setSource("智能告警");
            messageRecord.setStatus(0);

            // 设置告警记录信息
            AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
            alarmRecordDetail.setReservoirNumber(list.get(0));
@@ -774,6 +772,7 @@
            alarmRecordDetail.setStatus(1);
            // 删除 最后一个 告警记录id
            list.remove(list.size() - 1);
            messageRecord.setResGuid(list.get(0));
            // 删除 0 水库编码
            list.remove(0);

@@ -839,8 +838,8 @@
        // 按手机号分组
        Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));


        listMap.forEach((phone, temps) -> {
            List<String> resCdList = new ArrayList<>();
            MessageRecord messageRecord = new MessageRecord();

            messageRecord.setTheme(alarmRule.getRuleName());
@@ -854,6 +853,7 @@
            Map<String, List<Temp>> resCollect = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
            List<String> contentList = new ArrayList<>();
            resCollect.forEach((resCode, contentTemp) -> {
                resCdList.add(resCode);
                List<String> cdNmList = new ArrayList<>();
                //凤凰水库（测点12170062992），大新众水库（测点12170063012、测点12170062998）
                //因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
@@ -871,7 +871,7 @@
            fillList.add(contentListStr);
            String sendContent = contentConvert(smsTemplate.getContent(), fillList);
            messageRecord.setContent(sendContent);

            messageRecord.setResGuid(String.join(",",resCdList));
            messageRecordList.add(messageRecord);
        });

@@ -926,11 +926,12 @@
            messageRecord.setStatus(0);
            messageRecord.setRecipient(phone);


            StringBuilder builder = new StringBuilder();
            List<String> resCdList = new ArrayList<>();
            Map<String, List<Temp>> resCollect = temps.stream().collect(Collectors.groupingBy(Temp::getReservoirCode));
            List<String> contentList = new ArrayList<>();
            resCollect.forEach((resCode, contentTemp) -> {
                resCdList.add(resCode);

                List<String> cdNmList = new ArrayList<>();
                //凤凰水库（测点12170062992），大新众水库（测点12170063012、测点12170062998）
                //因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
@@ -948,7 +949,7 @@
            fillList.add(contentListStr);
            String sendContent = contentConvert(smsTemplate.getContent(), fillList);
            messageRecord.setContent(sendContent);

            messageRecord.setResGuid(String.join(",",resCdList));
            messageRecordList.add(messageRecord);
        });

@@ -987,7 +988,7 @@
        // 按手机号分组
        Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));


        List<String> resCdList = new ArrayList<>();
        listMap.forEach((phone, temps) -> {
            MessageRecord messageRecord = new MessageRecord();

@@ -999,6 +1000,7 @@
            List<String> contentList = new ArrayList<>();
            //因为只能按编号分组，名称会有重复，所以拿第一条数据的名称就行
            temps.forEach(info -> {
                resCdList.add(info.getReservoirCode());
                //把水库加进集合
                contentList.add(info.getReservoirName());
            });
@@ -1008,6 +1010,8 @@
            fillList.add(contentListStr);
            String sendContent = contentConvert(smsTemplate.getContent(), fillList);
            messageRecord.setContent(sendContent);

            messageRecord.setResGuid(String.join(",",resCdList));
            messageRecordList.add(messageRecord);
        });

@@ -1125,4 +1129,7 @@
    }


    public String getNoAlertRes(String ruleName) {
        return messageClient.getNoAlertRes(ruleName);
    }
}

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

@@ -175,6 +175,8 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_z_is_warn_over_flse_api);
        //过滤不告警水库
        JSONArray resultData = filterNoAlertRes(ztData, arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -183,7 +185,7 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterComeOverList, true, adCode, true);
                        asyncNoticeHandle.waterComeOverHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeOverList, true, adCode, true);
                    }
                }
            }
@@ -303,6 +305,9 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_over_des_is_warn_api);

        //过滤不告警水库
        JSONArray resultData = filterNoAlertRes(ztData, arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -311,13 +316,13 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterComeDesignList1, true, adCode, false, uuid);
                        asyncNoticeHandle.waterComeDesignHandleBySms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList1, true, adCode, false, uuid);
                    }
//                    if (alarmRuleDetail.getAlarmMode().equals("电话")) {
//                        asyncNoticeHandle.outCallHandleCall(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterComeDesignList2,true, adCode, false,uuid);
//                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterComeDesignList3, true, adCode, true, uuid);
                        asyncNoticeHandle.waterComeDesignHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.waterComeDesignList3, true, adCode, true, uuid);
                    }
                }
            }
@@ -624,6 +629,10 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("?is_alarm=1", ZtApiUrlConstant.alarm_db_sy_api);

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(ztData,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -632,7 +641,7 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetySyList, true, adCode, true, uuid);
                    }
                }
            }
@@ -656,6 +665,9 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_none_api);

        JSONArray resultData = filterNoAlertRes(ztData, arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -664,10 +676,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                    }
                }
            }
@@ -691,6 +703,7 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sl_none_api);
        JSONArray resultData = filterNoAlertRes(ztData, arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -699,10 +712,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                    }
                }
            }
@@ -726,6 +739,7 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_none_api);
        JSONArray resultData = filterNoAlertRes(ztData, arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -734,10 +748,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyHandle(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyNoneHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.damSafetyList, false, adCode, true, uuid);
                    }
                }
            }
@@ -763,7 +777,7 @@
        List<AlertTextualResearchAttachVO> syDataMissing = textualResearchAttachClient.getSyDataMissing();

        JSONArray data = JSON.parseArray(JSON.toJSONString(syDataMissing));

        JSONArray resultData = filterNoAlertRes(data, arg1);

        if (null != alarmRule) {
            // 查询告警详情信息
@@ -772,10 +786,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, true, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("短信")){
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syDataMissingList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syDataMissingList, false, adCode, false, uuid);
                    }
                }
            }
@@ -800,7 +814,7 @@
        List<AlertTextualResearchAttachVO> syDataMissing = textualResearchAttachClient.getBxDataMissing();

        JSONArray data = JSON.parseArray(JSON.toJSONString(syDataMissing));

        JSONArray resultData = filterNoAlertRes(data, arg1);
        if (null != alarmRule) {
            // 查询告警详情信息
            List<AlarmRuleDetail> alarmRuleDetailList = alarmRuleDetailService.list(new QueryWrapper<AlarmRuleDetail>().eq("alarm_rule_id", alarmRule.getId()));
@@ -808,10 +822,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyDataMissingHandle(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, true, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("短信")){
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyDataMissingHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.bxDataMissingList, false, adCode, false, uuid);
                    }
                }
            }
@@ -836,7 +850,8 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_less_or_higher_api);
        JSONArray array = lessOrHigher(ztData, "less");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(array,arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -845,10 +860,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, array, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, array, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyLessThenPipeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syLessThenPipe, true, adCode, true, uuid);
                    }
                }
            }
@@ -876,7 +891,8 @@


        JSONArray array = lessOrHigher(ztData, "higher");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(array,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
@@ -886,10 +902,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, array,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid);
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleSms(alarmRule, alarmRuleDetail, resultData,ZtApiDataColumnConstant.syHigherThenNozzle,true, adCode, false,uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, array, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenNozzleHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenNozzle, true, adCode, true, uuid);
                    }
                }
            }
@@ -913,7 +929,8 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_higher_then_bdElevation_api);

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(ztData,arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -922,10 +939,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenBdElevationHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenBdElevation, true, adCode, true, uuid);
                    }
                }
            }
@@ -947,7 +964,8 @@
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_higher_then_water_level_api);

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(ztData,arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -956,10 +974,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyHigherThenWaterLevelHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syHigherThenWaterLevel, true, adCode, true, uuid);
                    }
                }
            }
@@ -986,6 +1004,10 @@
        JSONArray data = changeRange(ztData, "1");


        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);


        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -994,10 +1016,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyYellowChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyYellowChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syYellowRzChange, true, adCode, true, uuid);
                    }
                }
            }
@@ -1022,7 +1044,8 @@
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_rz_change_api);

        JSONArray data = changeRange(ztData, "2");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
@@ -1032,10 +1055,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyOrangeChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syOrangeRzChange, true, adCode, true, uuid);
                    }
                }
            }
@@ -1060,7 +1083,8 @@
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_rz_change_api);

        JSONArray data = changeRange(ztData, "3");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
@@ -1070,10 +1094,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyRedChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyRedChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRedRzChange, true, adCode, true, uuid);
                    }
                }
            }
@@ -1097,7 +1121,8 @@
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_rz_1h_change_api);

        JSONArray data = judgeType(ztData);

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1106,10 +1131,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySyRz1hChangeHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.syRz1hChange, true, adCode, true, uuid);
                    }
                }
            }
@@ -1135,7 +1160,8 @@
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_value_api);

        JSONArray data = judgeDirection(ztData, "1");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1144,10 +1170,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWyOver2Less5HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver2Less5, true, adCode, true, uuid);
                    }
                }
            }
@@ -1175,7 +1201,8 @@
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_value_api);

        JSONArray data = judgeDirection(ztData, "2");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);
        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1184,10 +1211,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWyOver5Less10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver5Less10, true, adCode, true, uuid);
                    }
                }
            }
@@ -1213,6 +1240,11 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_value_1h_change_over_10_api);
        JSONArray data = judgeDirection(ztData, "3");


        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1221,10 +1253,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWyOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWyOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wyOver10, true, adCode, true, uuid);
                    }
                }
            }
@@ -1248,6 +1280,11 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_value_1h_change_over_10_api);
        JSONArray data = judgeDirectionV2(ztData);

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);


        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1256,10 +1293,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetyWy1hChangeOver10HandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                    }
                }
            }
@@ -1285,6 +1322,11 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sl_value_change_api);
        JSONArray data = filterData(ztData,"1");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);


        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1293,10 +1335,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                    }
                }
            }
@@ -1322,6 +1364,10 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sl_value_change_api);
        JSONArray data = filterData(ztData,"2");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1330,10 +1376,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                    }
                }
            }
@@ -1359,6 +1405,10 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sl_value_change_api);
        JSONArray data = filterData(ztData,"3");

        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);

        // 获取告警规则详情，判断告警类型（短信，电话，站内信）
        if (null != alarmRule) {
            // 查询告警详情信息
@@ -1367,10 +1417,10 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleSms(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, false, uuid);
                    }
                    if (alarmRuleDetail.getAlarmMode().equals("站内信")) {
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, data, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                        asyncNoticeHandle.damSafetySlOverLessHandleStation(alarmRule, alarmRuleDetail, resultData, ZtApiDataColumnConstant.wy1hChangeOver10, true, adCode, true, uuid);
                    }
                }
            }
@@ -1683,4 +1733,34 @@
    }



    //过滤不需要告警的水库
    public JSONArray filterNoAlertRes(JSONArray jsonArray,String ruleName){
        JSONArray result = new JSONArray();

        //获取要过滤的水库数据
        String noAlertRes= noticeHandle.getNoAlertRes(ruleName);

        if (StringUtil.isBlank(noAlertRes)){
            //如果没有需要过滤的数据
            return jsonArray;
        }

        for (int i = 0; i < jsonArray.size(); i++) {

            JSONObject jsonObject = jsonArray.getJSONObject(i);

            String resCd = jsonObject.getString("res_cd");
            //判断水库是否在不告警水库列表中
            boolean contains = noAlertRes.contains(resCd);

            if (!contains){
                //不在则往结果集中加入数据
                result.add(jsonObject);
            }
        }
        return  result;
    }


}

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java

@@ -959,7 +959,11 @@
                        alarmRecordDetailArrayList.add(alarmRecordDetail1);
                    }
                    // 保存告警记录详情信息
                    boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
                    try {
                        boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
                    }catch (Exception e){
                        e.printStackTrace();
                    }
                }
            }
        });

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/controller/MessageRecordController.java

@@ -62,4 +62,9 @@
        return R.data(messageRecordService.updateById(messageRecord));
    }

    @PostMapping(value = "/update")
    public R update(@RequestBody MessageRecord messageRecord) {
        return R.data(messageRecordService.updateById(messageRecord));
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/feign/MessageClient.java

@@ -67,4 +67,10 @@
        messageRecord.setStatus(0);
        return messageRecordService.list(Condition.getQueryWrapper(messageRecord));
    }

    @Override
    @GetMapping(GET_NO_ALERT_RES_LIST)
    public String getNoAlertRes(String ruleName) {
        return messageRecordService.getNoAlertRes(ruleName);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/mapper/MessageRecordMapper.java

@@ -31,4 +31,6 @@
     */
    List<MessageRecordVO> selectMessageRecordPageList(@Param("page") IPage<MessageRecordVO> page,
                                                      @Param("messageRecord") MessageRecordVO messageRecord);

    String getNoAlertRes(@Param("ruleName") String ruleName);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/mapper/MessageRecordMapper.xml

@@ -34,4 +34,14 @@

        ORDER BY ID DESC
    </select>

    <!--查询状态为2且，7天后的时间比现在大的数据-->
    <select id="getNoAlertRes" resultType="java.lang.String">
        select
            wm_concat(res_guid)
        from ywxt.sm_message_record
        where alert_status = 2
          and add_days(update_time,7)>= now()
            and theme = #{ruleName}
    </select>
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/service/IMessageRecordService.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
@@ -27,4 +29,6 @@
     * @return
     */
    Object selectMessageRecordPageList(IPage<MessageRecordVO> page, MessageRecordVO messageRecord);

   String getNoAlertRes(String ruleName);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/message/service/impl/MessageRecordService.java

@@ -8,6 +8,8 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
@@ -41,4 +43,11 @@
        }
        return page.setRecords(baseMapper.selectMessageRecordPageList(page,messageRecord));
    }

    @Override
    public String getNoAlertRes(String ruleName) {
        return baseMapper.getNoAlertRes(ruleName);
    }


}