告警优化

zrj

2024-09-02 6609eaa37c491fc13ab12e1114425dd0f728fdd2

告警优化

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

@@ -203,7 +203,7 @@
        String uuid = alarmRuleDetail.getTemplateId() + UUID.randomUUID().toString();
        // 只发短信，将发短信信息组装好
        SmsRequestTemplate smsRequestTemplate
            = noticeHandle.getSendSmsTemplate(ztData, alarmRule, alarmRuleDetail, columnList, flag, adCode, uuid, isSendStation);
            = noticeHandle.getSendSmsTemplate(ztData, alarmRule, alarmRuleDetail, columnList, ZtApiDataColumnConstant.waterFirstOverMergeWaterList,flag, adCode, uuid, isSendStation);
        // 拼接后面内容
        if (smsRequestTemplate.getPersonVOList().size() > 0) {
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
@@ -219,9 +219,10 @@

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

            if (!isTimeSend()) return map;

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

@@ -38,6 +38,7 @@
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.logging.log4j.util.Strings;
import org.jetbrains.annotations.NotNull;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -127,7 +128,52 @@
            // 解析模板并设置 title
            smsRequestTemplate.setTitle(FormatUtil.composeMessage(smsTemplate.getContent()));
            // 列名数据转换
            getColumnData(jsonArray, columnsList, smsRequestTemplate, alarmRuleDetail, flag, adCode, uuid);
            getColumnData(jsonArray, columnsList,null, smsRequestTemplate, alarmRuleDetail, flag, adCode, uuid);
            //返回
            return smsRequestTemplate;
        }
        return null;
    }

    /**
     * 短信发送数据组装(包含了合并水库名称)
     *
     * @param jsonArray       告警动态数据
     * @param alarmRule       告警规则信息
     * @param alarmRuleDetail 告警规则详情信息
     * @param columnsList     列名集合信息
     * @param mergeColumnsList     合并列名集合信息（合并水库名称）
     * @param flag            是否包含日期
     * @param adCode          行政区编号(是否过滤区县数据)
     * @param uuid            本次执行临时编号
     * @param isSendStation   是否发送站内信
     * @return
     */
    public SmsRequestTemplate getSendSmsTemplate(JSONArray jsonArray,
                                                 AlarmRule alarmRule,
                                                 AlarmRuleDetail alarmRuleDetail,
                                                 List<String> columnsList,
                                                 List<String> mergeColumnsList,
                                                 Boolean flag,
                                                 String adCode,
                                                 String uuid,
                                                 Boolean isSendStation) {
        // 通过模板id 查询模板相关信息(外呼对应的模板id则为场景id)
        SmsTemplate smsTemplate
            = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("id", alarmRuleDetail.getTemplateId()).eq("is_deleted", 0));
        if (null != smsTemplate) {
            // 创建消息发送对象
            SmsRequestTemplate smsRequestTemplate = new SmsRequestTemplate();
            // 设置是否发送站内信
            smsRequestTemplate.setIsSendStation(isSendStation);
            // 设置告警信息
            smsRequestTemplate.setAlarmRule(alarmRule);
            // 设置模板信息
            smsRequestTemplate.setSmsTemplate(smsTemplate);
            // 解析模板并设置 title
            smsRequestTemplate.setTitle(FormatUtil.composeMessage(smsTemplate.getContent()));
            // 列名数据转换
            getColumnData(jsonArray, columnsList, mergeColumnsList, smsRequestTemplate, alarmRuleDetail, flag, adCode, uuid);
            //返回
            return smsRequestTemplate;
        }
@@ -148,6 +194,7 @@
     */
    private void getColumnData(JSONArray jsonArray,
                               List<String> columnsList,
                               List<String> mergeColumnsList,
                               SmsRequestTemplate smsRequestTemplate,
                               AlarmRuleDetail alarmRuleDetail,
                               Boolean flag,
@@ -157,6 +204,8 @@
        List<PersonVO> personLists = new ArrayList<>();
        // 告警内容
        List<List<String>> lists = new ArrayList<>();
        // 合并告警内容集合
        List<List<String>> moreLists = new ArrayList<>();
        // 创建set对象用于去重处理
        Set<String> set = new HashSet<>();
        // 查询对应的角色信息
@@ -168,11 +217,11 @@
                String county_cd = jsonArray.getJSONObject(i).getString("county_cd");
                if (null != county_cd && county_cd.equals(adCode)) {
//                    jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
                    jointDataV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, uuid, set);
                    jointDataV2(jsonArray, columnsList,mergeColumnsList, alarmRuleDetail, roles, flag, personLists, lists,moreLists, i, uuid, set);
                }
            } else {
//                jointData(jsonArray, columnsList, alarmRuleDetail, flag, personLists, lists, i,uuid,set);
                jointDataV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, uuid, set);
                jointDataV2(jsonArray, columnsList,mergeColumnsList, alarmRuleDetail, roles, flag, personLists, lists,moreLists, i, uuid, set);
            }
        }
        // 设置信息
@@ -194,136 +243,45 @@
     */
    private void jointDataV2(JSONArray jsonArray,
                             List<String> columnsList,
                             List<String> mergeColumnsList,
                             AlarmRuleDetail alarmRuleDetail,
                             List<String> roles, Boolean flag,
                             List<String> roles,
                             Boolean flag,
                             List<PersonVO> personLists,
                             List<List<String>> lists,
                             List<List<String>> moreLists,
                             int i,
                             String uuid,
                             Set<String> set) {
        // 根据水库编号，所在区域查询需要发送的人员手机号及设置
        JSONObject jsonObject = jsonArray.getJSONObject(i);
        String res_cd = jsonObject.getString("res_cd");
        String res_nm = jsonObject.getString("res_nm");
        String town_nm = jsonObject.getString("town_nm");
        String county_nm = jsonObject.getString("county_nm");
        String city_nm = jsonObject.getString("city_nm");
        log.info("当前为第{}个水库，行政区划:{}-{}-{}，水库编码：{}，水库名称：{}", i + 1, city_nm, county_nm, town_nm, res_cd, res_nm);
        log.info("当前为第{}个水库，行政区划:{}-{}-{}，水库编码：{}，水库名称：{}", i + 1,
            jsonObject.getString("city_nm"), jsonObject.getString("county_nm"), jsonObject.getString("town_nm"), res_cd, jsonObject.getString("res_nm"));
        // 设置临时字符串，用于去重判断
        String tempStr = uuid + res_cd;
        // 去重水库操作，如果有重复的水库则不操作
        if (!set.contains(tempStr)) {
            set.add(tempStr);
            String stcd = jsonArray.getJSONObject(i).getString("stcd");
            if (StringUtil.isBlank(stcd)) {
                stcd = jsonArray.getJSONObject(i).getString("rain_stcd");
            }
            if (StringUtil.isBlank(stcd)) {
                stcd = jsonArray.getJSONObject(i).getString("cd");
            }
            //如果stcd是空的就设置为-1
            if (StringUtil.isBlank(stcd)){
                stcd = "-1";
            }
            // 判断时间是否存在
            String tm = jsonArray.getJSONObject(i).getString("tm");
            String day = "";
            String hour = "";
            String minute = "";
            if (null != tm && !tm.equals("") && flag) {
                //如果显示日期，并且中台的日期不为空，则使用中台的日期
                flag = true;
                // 加入天，时，分
                day = tm.substring(8, 10);
                hour = tm.substring(11, 13);
                minute = tm.substring(14, 16);
            } else if (flag) {
                //如果显示日期，但是中台没传日期，就使用当前时间
                Date now = DateUtil.now();
                String formatTm = DateUtil.format(now, DateUtil.PATTERN_DATETIME);
                // 加入天，时，分
                day = formatTm.substring(8, 10);
                hour = formatTm.substring(11, 13);
                minute = formatTm.substring(14, 16);
            } else {
                flag = false;
            }
            // 获取告警人员信息
//            getAlarmPersonList(jsonArray, columnsList, alarmRuleDetail,flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
            //这里把jsonObject传过去
            getAlarmPersonListV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
        }

    }

    /**
     * 根据告警人员拼接数据
     * @param jsonArray
     * @param columnsList
     * @param alarmRuleDetail
     * @param roles
     * @param flag
     * @param personLists
     * @param lists
     * @param i
     * @param res_cd
     * @param day
     * @param hour
     * @param minute
     * @param stcd
     */
    private void getAlarmPersonListV2(JSONArray jsonArray,
                                      List<String> columnsList,
                                      AlarmRuleDetail alarmRuleDetail,
                                      List<String> roles,
                                      Boolean flag,
                                      List<PersonVO> personLists,
                                      List<List<String>> lists,
                                      int i,
                                      String res_cd,
                                      String day,
                                      String hour,
                                      String minute,
                                      String stcd) {
        // 查询告警人员信息
        List<PersonVO> personVOList = getPersonListByResGuidV2(res_cd, roles);
        if (personVOList.size() > 0) {
            List<PersonVO> personVOList = getPersonListByResGuidV2(res_cd, roles);
            // 按发送人员手机号进行告警内容数据拼接
            for (PersonVO personVO : personVOList) {
                //处理重复发送手机号
                boolean isAdd = true;
                for (List<String> listStr : lists) {
                    // 如果水库编号和手机号都一致，则不新增
                    if (listStr.contains(res_cd) && listStr.contains(personVO.getPhone())) {
                        isAdd = false;
                        break;
                    }
                }
                // 跳出本次循环，直接进行下一次循环
                if (!isAdd){
                // 处理重复发送手机号，跳出本次循环，直接进行下一次循环
                if (!isAdd(lists, res_cd, personVO)){
                    break;
                }
                // 开始拼接内容
                List<String> list = new ArrayList<>();
                list.add(stcd);
                // 测站编号处理
                stcdHandle(jsonArray, i, list);
                // 加入水库编号、手机号
                list.add(res_cd);
                list.add(personVO.getPhone());
                //拿测点值
                String val = "";
                JSONObject jsonObject = jsonArray.getJSONObject(i);
                val = jsonObject.getString("monitorData");
                list.add(val);
                if (flag) {
                    // 如果是电话告警，需要把日期拼到一起
                    if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                        String tem = day + "日" + hour + "时" + minute + "分";
                        list.add(tem);
                    } else {
                        list.add(day);
                        list.add(hour);
                        list.add(minute);
                    }
                }
                list.add(Strings.isBlank(jsonObject.getString("monitorData"))?"":jsonObject.getString("monitorData"));
                //日期处理
                flag = timeHandle(jsonArray, alarmRuleDetail, flag, i, list);
                // 合并水库名称
                boolean isMerge = mergeResName(jsonArray, columnsList, lists, i, personVO,list.size());
                if (isMerge){
@@ -340,8 +298,96 @@
                // 加入告警内容集合
                lists.add(list);
            }
            personLists.addAll(personVOList);
        }
        personLists.addAll(personVOList);
    }

    /**
     * 日期处理
     * @param jsonArray
     * @param alarmRuleDetail
     * @param flag
     * @param i
     * @param list
     * @return
     */
    @NotNull
    private Boolean timeHandle(JSONArray jsonArray, AlarmRuleDetail alarmRuleDetail, Boolean flag, int i, List<String> list) {
        // 判断时间是否存在
        String tm = jsonArray.getJSONObject(i).getString("tm");
        String day = "";
        String hour = "";
        String minute = "";
        if (!Strings.isBlank(tm) && flag) {
            //如果显示日期，并且中台的日期不为空，则使用中台的日期
            flag = true;
            // 加入天，时，分
            day = tm.substring(8, 10);
            hour = tm.substring(11, 13);
            minute = tm.substring(14, 16);
        } else if (flag) {
            //如果显示日期，但是中台没传日期，就使用当前时间
            Date now = DateUtil.now();
            String formatTm = DateUtil.format(now, DateUtil.PATTERN_DATETIME);
            // 加入天，时，分
            day = formatTm.substring(8, 10);
            hour = formatTm.substring(11, 13);
            minute = formatTm.substring(14, 16);
        } else {
            flag = false;
        }
        if (flag) {
            // 如果是电话告警，需要把日期拼到一起
            if (alarmRuleDetail.getAlarmMode().equals("电话")) {
                String tem = day + "日" + hour + "时" + minute + "分";
                list.add(tem);
            } else {
                list.add(day);
                list.add(hour);
                list.add(minute);
            }
        }
        return flag;
    }

    /**
     * 测站编号处理
     * @param jsonArray
     * @param i
     * @param list
     */
    private void stcdHandle(JSONArray jsonArray, int i, List<String> list) {
        String stcd = jsonArray.getJSONObject(i).getString("stcd");
        if (StringUtil.isBlank(stcd)) {
            stcd = jsonArray.getJSONObject(i).getString("rain_stcd");
        }
        if (StringUtil.isBlank(stcd)) {
            stcd = jsonArray.getJSONObject(i).getString("cd");
        }
        //如果stcd是空的就设置为-1
        if (StringUtil.isBlank(stcd)){
            stcd = "-1";
        }
        list.add(stcd);
    }

    /**
     * 如果存在一个人对应水库有重复的则不新增
     * @param lists
     * @param res_cd
     * @param personVO
     * @return
     */
    private boolean isAdd(List<List<String>> lists, String res_cd, PersonVO personVO) {
        boolean isAdd = true;
        for (List<String> listStr : lists) {
            // 如果水库编号和手机号都一致，则不新增
            if (listStr.contains(res_cd) && listStr.contains(personVO.getPhone())) {
                isAdd = false;
                break;
            }
        }
        return isAdd;
    }

    /**
@@ -368,7 +414,7 @@
                // 判断合并的水库名称是否超过3个，超过3个则不在合并，直接舍弃
                String resNames = listStr.get(index);
                int length = resNames.split("、").length;
                if (length>3){
                if (length>2){
                    break;
                }
                // 变量将值放入集合中
@@ -383,7 +429,7 @@
                            format = format + jsonArray.getJSONObject(i).getString(s);
                        }
                        format = format.replaceAll("null","");
                        // 合并水库名称信息
                        // 合并水库名称信息,2個以上拼接等
                        if (length==2){
                            listStr.set(index,listStr.get(index) + "、" + format + "等");
                        }else {

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

@@ -222,15 +222,15 @@
            List<List<String>> templateList = getAlarmList(list);
            // 批量发送短信
            Map<String, Object> map = batchSendAlertsSms(smsRequestTemplate.getSmsTemplate(), list);
            int count = Integer.parseInt(map.get("errCount").toString());
            ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
            // 保存短信结果记录
            SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
            // 保存详情记录（短信详情，告警详情）
            List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(),
                templateList,request,smsRequestTemplate.getAlarmRule(),isSendStation);
            // number 累加
            number += smsRecordList.size();
//            int count = Integer.parseInt(map.get("errCount").toString());
//            ComResult<DynSMSSendDataResult> resultComResult =(ComResult<DynSMSSendDataResult>) map.get("resultComResult");
//            // 保存短信结果记录
//            SmsResult smsResult = saveSendResult(alarmRule.getId(),resultComResult.getCode().toString(),resultComResult.getMsg(),request, list.size() - count);
//            // 保存详情记录（短信详情，告警详情）
//            List<SmsRecord> smsRecordList = saveAlertsAndSmsDetail(smsResult,resultComResult,smsRequestTemplate.getSmsTemplate(),
//                templateList,request,smsRequestTemplate.getAlarmRule(),isSendStation);
//            // number 累加
//            number += smsRecordList.size();
        }
        // 设置返回数据
        Map<String, Object> params = new HashMap<>(1);