Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-07-26 ea93f8178402a77b610c611ee8ad228145a202a8

Merge remote-tracking branch 'origin/jtdev' into jtdev

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

@@ -47,4 +47,19 @@
     */
    public static final String over_des_rz_warn_api = "/services/1234567890ABCDEFGHIJKLMN/over_des_rz/warn";

    /**
     * 已降大雨告警
     */
    public static final String alam_rain_dy_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/dy/api";

    /**
     * 已降暴雨告警
     */
    public static final String alam_rain_by_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/by/api";

    /**
     * 6小时降雨告警
     */
    public static final String alam_rain_6_over_api = "/services/1234567890ABCDEFGHIJKLMN/alarm/rain/6/over/api";

}

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

@@ -79,6 +79,42 @@
        smsService.sendMergeSignMsg(smsRequestTemplate);
    }

    /**
     * 3.水位超低于死水位
     * @param templateId
     * @param uuid
     * @param alarmRule
     * @param adCode
     * @param isSendStation
     */
    @Async
    public Map<String, Object> waterLessDeadHandle(String templateId, String uuid, AlarmRule alarmRule, String adCode, boolean isSendStation) {
        Map<String, Object> map = new HashMap<>();
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
        // 只发送站内信
        SmsRequestTemplate smsRequestTemplate = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true,adCode,uuid);
        // 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
        if (smsRequestTemplate.getPersonVOList().size()>0) {
            // 遍历，拼接县水利部人员电话
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
                // 后面依次拼接市县水利部门人员姓名电话
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }
            }
            // 调用短信服务
            map = smsService.sendSignMsg(smsRequestTemplate);
            // 返回
            return map;
        }
        return map;
    }


    /**
     * 5.水位接近汛限告警
@@ -94,18 +130,20 @@
        // 只发送站内信
        SmsRequestTemplate smsRequestTemplate = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true,null,uuid);
        // 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
        // 遍历，拼接县水利部人员电话
        for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 后面依次拼接 巡查责任人姓名，技术责任人姓名，市县水利部门人员姓名电话（暂时不要）
            noticeHandle.addPatrolTechnologyInfo(list);
            // 市县水利部门人员姓名电话（暂时不要）
        if (smsRequestTemplate.getPersonVOList().size()>0) {
            // 遍历，拼接县水利部人员电话
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
                // 后面依次拼接 巡查责任人姓名，技术责任人姓名，市县水利部门人员姓名电话（暂时不要）
                noticeHandle.addPatrolTechnologyInfo(list);
                // 市县水利部门人员姓名电话（暂时不要）
//                list.add("测试:13112341234");
            // 保存告警记录信息
                // 保存告警记录信息
//            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
//            if (null != alarmRecord) {
//                list.add(alarmRecord.getId().toString());
                    list.add("999");
                list.add("999");
//            }
            }
        }
        // 保存站内信记录信息
        noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);

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

@@ -121,30 +121,14 @@
     * @return
     */
    public String waterLessDeadHandle(String arg1, String arg2) {
        String adCode = "420607000000";
//        String adCode = null;
        String templateId = "2431012248594";
        String uuid = templateId + UUID.randomUUID().toString();
        // 查询当前策略对应的告警规则信息
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        if (null!=alarmRule) {
            // 调用中台服务接口查询数据
            JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.res_diff_dead_z_api);
            // 只发短信，将发短信信息组装好
            SmsRequestTemplate smsRequestTemplate = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterLessDeadList,true,null,uuid);
            // 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
            // 遍历，拼接县水利部人员电话
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
                // 查询县水利部人员（通过水库编号）
//                list.add("测试:13112341234");
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }
            }
            // 调用短信服务
            Map<String, Object> map = smsService.sendSignMsg(smsRequestTemplate);
            // 返回
            return "本次-水位初次超汛限告警短信成功通知数量：" + map.get("smsRecord");
            asyncNoticeHandle.waterLessDeadHandle(templateId,uuid,alarmRule,adCode,false);
        }
        // 返回
        return "水位超低于死水位";