水位初次超汛告警合并发送内容调整

zrj

2024-09-02 61a1d1977ce7c15ba5aa0064c35e48bec41064c9

水位初次超汛告警合并发送内容调整

 skjcmanager/skjcmanager-service-api/skjcmanager-alerts-api/src/main/java/cn/gistack/alerts/alarmRule/entity/AlarmRuleDetail.java

@@ -43,6 +43,11 @@
    private String templateId;

    /**
     * 模板表ID (合并内容发送模板)
     */
    private String mergeTemplateId;

    /**
     * 备注
     */
    private String alarmRemark;

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

@@ -68,6 +68,14 @@
    }};

    /**
     * 6.1水位初次超汛限告警-合并水库
     */
    public static List<String>  waterFirstOverMergeWaterList = new ArrayList<String>()
    {{
        add("town_nm,res_nm,1");
    }};

    /**
     * 7.水位小幅超汛限告警
     */
    public static List<String>  waterSmallScaleOverList = new ArrayList<String>()

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

@@ -208,17 +208,17 @@
        if (smsRequestTemplate.getPersonVOList().size() > 0) {
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
                // 依次拼接巡查责任人，技术责任人姓名
                noticeHandle.addPatrolTechnologyInfo(list, false);
//                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

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

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

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

@@ -157,11 +157,11 @@
        List<PersonVO> personLists = new ArrayList<>();
        // 告警内容
        List<List<String>> lists = new ArrayList<>();
        // 创建set对象用于去重处理
        Set<String> set = new HashSet<>();

        // 查询对应的角色信息
        List<String> roles = sysClient.getRoleNames(alarmRuleDetail.getAlarmPerson()).getData();

        // 遍历处理数据
        for (int i = 0; i < jsonArray.size(); i++) {
            if (null != adCode) {
                // city_cd,county_cd 过滤数据
@@ -180,7 +180,27 @@
        smsRequestTemplate.setTemplateContent(lists);
    }

    private void jointDataV2(JSONArray jsonArray, List<String> columnsList, AlarmRuleDetail alarmRuleDetail, List<String> roles, Boolean flag, List<PersonVO> personLists, List<List<String>> lists, int i, String uuid, Set<String> set) {
    /**
     * 设置合并数据
     * @param jsonArray          告警动态数据
     * @param columnsList        告警动态内容 key
     * @param alarmRuleDetail    告警人员角色ids
     * @param flag               告警内容是否日期
     * @param personLists        人员集合
     * @param lists              告警内容集合
     * @param i                  遍历集合的索引
     * @param uuid                 uuid
     * @param set                 用于去重
     */
    private void jointDataV2(JSONArray jsonArray,
                             List<String> columnsList,
                             AlarmRuleDetail alarmRuleDetail,
                             List<String> roles, Boolean flag,
                             List<PersonVO> personLists,
                             List<List<String>> lists,
                             int i,
                             String uuid,
                             Set<String> set) {
        // 根据水库编号，所在区域查询需要发送的人员手机号及设置
        JSONObject jsonObject = jsonArray.getJSONObject(i);
        String res_cd = jsonObject.getString("res_cd");
@@ -189,16 +209,7 @@
        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);
        // 取出测站编码
//        String stcd = jsonArray.getJSONObject(i).getString("stcd");
//        if (StringUtil.isBlank(stcd)) {
//            stcd = jsonArray.getJSONObject(i).getString("cd");
//        }
//        //如果stcd是空的就设置为-1
//        if (StringUtil.isBlank(stcd)){
//            stcd = "-1";
//        }

        // 设置临时字符串，用于去重判断
        String tempStr = uuid + res_cd;
        // 去重水库操作，如果有重复的水库则不操作
        if (!set.contains(tempStr)) {
@@ -239,24 +250,64 @@
            }
            // 获取告警人员信息
//            getAlarmPersonList(jsonArray, columnsList, alarmRuleDetail,flag, personLists, lists, i, res_cd, day, hour, minute, stcd);
            JSONObject jsonData = jsonArray.getJSONObject(i);
            //这里把jsonObject传过去
            getAlarmPersonListV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, res_cd, day, hour, minute, stcd,jsonData);
            getAlarmPersonListV2(jsonArray, columnsList, alarmRuleDetail, roles, flag, personLists, lists, i, res_cd, day, hour, minute, 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,JSONObject jsonData) {
    /**
     * 根据告警人员拼接数据
     * @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 = getPersonListByResGuid(res_cd, alarmRuleDetail.getAlarmPerson());
        List<PersonVO> personVOList = getPersonListByResGuidV2(res_cd, roles);
        if (personVOList.size() > 0) {
            // 按发送人员手机号进行告警内容数据拼接
            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){
                    break;
                }
                // 开始拼接内容
                List<String> list = new ArrayList<>();
                list.add(stcd);
                list.add(res_cd);
                list.add(personVO.getPhone());

                //拿测点值
                String val = "";
                JSONObject jsonObject = jsonArray.getJSONObject(i);
@@ -273,31 +324,77 @@
                        list.add(minute);
                    }
                }
                // 合并水库名称
                boolean isMerge = mergeResName(jsonArray, columnsList, lists, i, personVO,list.size());
                if (isMerge){
                    break;
                }
                // 最后动态将变量将值放入集合中
                for (String column : columnsList) {
                    String[] split = column.split(",");
                    String format = "";
                    format = addAlarmContent(jsonArray,i,split,format);
                    // 加入集合
                    list.add(format);
                }
                // 加入告警内容集合
                lists.add(list);
            }
        }
        personLists.addAll(personVOList);
    }

    /**
     * 合并水库名称内容
     * @param jsonArray 告警数据
     * @param columnsList 告警列
     * @param lists 告警内容
     * @param i 集合索引
     * @param personVO 人员信息
     * @param index 索引
     * @return
     */
    private boolean mergeResName(JSONArray jsonArray,
                                 List<String> columnsList,
                                 List<List<String>> lists,
                                 int i,
                                 PersonVO personVO,
                                 int index) {
        boolean isMerge = false;
        for (List<String> listStr : lists) {
            // 如果告警人员已经存在，则需要按规则判断是否合并水库名称,将当前人员告警内容中的水库名称合并
            if (listStr.contains(personVO.getPhone())) {
                isMerge = true;
                // 判断合并的水库名称是否超过3个，超过3个则不在合并，直接舍弃
                String resNames = listStr.get(index);
                int length = resNames.split("、").length;
                if (length>3){
                    break;
                }
                // 变量将值放入集合中
                for (String column : columnsList) {
                    String[] split = column.split(",");
                    String format = "";
                    // 内容处理
                    format = addAlarmContent(jsonArray, i, split, format);
//                    format = addAlarmContentV2(jsonData,split,format);
                    // 加入集合
                    list.add(format);
                }
                //处理重复发送手机号
                boolean isAdd = true;
                for (List<String> listStr : lists) {
                    if (listStr.contains(res_cd) && listStr.contains(personVO.getPhone())) {
                        isAdd = false;
                        break;
                    String lastString = split[split.length-1];
                    if (lastString.equals("1")) {
                        // 需要合并数据，目前只会合并乡镇水库名称，其他情况不处理
                        for (String s : split) {
                            // 乡镇水库拼接
                            format = format + jsonArray.getJSONObject(i).getString(s);
                        }
                        format = format.replaceAll("null","");
                        // 合并水库名称信息
                        if (length==2){
                            listStr.set(index,listStr.get(index) + "、" + format + "等");
                        }else {
                            listStr.set(index, listStr.get(index) + "、" + format);
                        }
                    }
                }

                if (isAdd)
                    lists.add(list);
                break;
            }
        }
        personLists.addAll(personVOList);

        return isMerge;
    }

    private List<PersonVO> getPersonListByResGuidV2(String res_cd, List<String> roles) {
@@ -451,6 +548,7 @@
     * @return
     */
    private String addAlarmContent(JSONArray jsonArray, int i, String[] split, String format) {
        // 无需合并数据
        for (String s : split) {
            // 超汛限水位
            if (s.equals("over_z")) {
@@ -510,12 +608,11 @@
            } else {
                format = format + jsonArray.getJSONObject(i).getString(s);
            }
            format = format.replaceAll("null","");
        }
        // 返回
        return format;
    }



    /**
     * 告警内容拼接处理
@@ -662,12 +759,12 @@
            //删除测值
            list.remove(3);
            // 新增
            boolean save = alarmRecordService.save(alarm);
            // 删除测站编号
//            boolean save = alarmRecordService.save(alarm);
//            // 删除测站编号
            list.remove(0);
            if (save) {
                return alarm;
            }
//            if (save) {
//                return alarm;
//            }
        }
        // 返回
        return null;

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

@@ -218,7 +218,7 @@
                // 遍历
                for (AlarmRuleDetail alarmRuleDetail : alarmRuleDetailList) {
                    if (alarmRuleDetail.getAlarmMode().equals("短信")) {
                        asyncNoticeHandle.waterFirstOverHandle(alarmRule, alarmRuleDetail, ztData, ZtApiDataColumnConstant.waterFirstOverList, true, adCode, false);
                        asyncNoticeHandle.waterFirstOverHandle(alarmRule, alarmRuleDetail, ztData,ZtApiDataColumnConstant.waterFirstOverMergeWaterList, true, adCode, false);
                    }
                }
            }

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/vo/SmsRequestTemplate.java

@@ -52,6 +52,12 @@
     */
    private List<List<String>> templateContent;


    /**
     * 合并内容（短信内容）--临时
     */
    private List<List<String>> templateMergeContent;

    /**
     * 类型 1：遍历发送  2：批量发送（一次发多个）
     */