大坝监测渗压告警增加明细

xieb

2024-05-24 d271dd871614b2376024a0ece2781399449e8bbc

大坝监测渗压告警增加明细

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

@@ -347,6 +347,15 @@
        add("val1");
        add("dayNum");
        add("diff_val");
        add("val1");
        add("val2");
        add("val5");
        add("val10");
        add("val30");
        add("diff_2");
        add("diff_5");
        add("diff_10");
        add("diff_30");
    }};

    /**
@@ -361,6 +370,15 @@
        add("val1");
        add("dayNum");
        add("diff_val");
        add("val1");
        add("val2");
        add("val5");
        add("val10");
        add("val30");
        add("diff_2");
        add("diff_5");
        add("diff_10");
        add("diff_30");
    }};

    /**
@@ -375,6 +393,7 @@
        add("sy_val");
        add("type");
        add("diff_val");
        add("lead_val");
    }};

    /**

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

@@ -1445,7 +1445,7 @@
                    list.get(13),list.get(14),list.get(15),list.get(16),list.get(17),
                    list.get(18),list.get(19),list.get(20),list.get(21)
                    );
                System.out.println(remark);
//                System.out.println(remark);
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
                if (null != alarmRecord) {
@@ -1536,8 +1536,24 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                String remark = StringUtil.format("一日测值：{}\n二日测值：{}\n五日测值：{}\n十日测值：{}\n三十日测值：{}\n" +
                        "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
                    list.get(14), list.get(15), list.get(16), list.get(17), list.get(18),
                    list.get(19), list.get(20), list.get(21), list.get(22)
                );
                list.remove(14);
                list.remove(15);
                list.remove(16);
                list.remove(17);
                list.remove(18);
                list.remove(19);
                list.remove(20);
                list.remove(21);
                list.remove(22);
//                System.out.println(remark);
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }
@@ -1612,8 +1628,23 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                String remark = StringUtil.format("一日测值：{}\n二日测值：{}\n五日测值：{}\n十日测值：{}\n三十日测值：{}\n" +
                        "二日变幅：{}\n五日变幅：{}\n十日变幅：{}\n三十日变幅：{}\n",
                    list.get(14), list.get(15), list.get(16), list.get(17), list.get(18),
                    list.get(19), list.get(20), list.get(21), list.get(22)
                );
                list.remove(14);
                list.remove(15);
                list.remove(16);
                list.remove(17);
                list.remove(18);
                list.remove(19);
                list.remove(20);
                list.remove(21);
                list.remove(22);
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }
@@ -1649,6 +1680,7 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
                if (null != alarmRecord) {
@@ -1687,8 +1719,15 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);

                String remark = StringUtil.format("当前测值：{}\n近1H测值：{}\n{}：{}\n",
                    list.get(11), list.get(14), list.get(12), list.get(13)
                );
                // 不拼接短信内容需要删除
                list.remove(14);
                System.out.println(remark);
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }

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

@@ -590,7 +590,7 @@
     */
    public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid) {
        AlarmRecord alarmRecord = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
//            .eq("temp_code", uuid)
            .eq("temp_code", uuid)
            .eq("alarm_rule_id", alarmRule.getId())
            .eq("reservoir_number", list.get(1))
            .eq("alarm_survey_station_code",list.get(0))

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

@@ -1126,6 +1126,7 @@
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_sy_rz_1h_change_api);

        // 处理数据
        JSONArray data = judgeType(ztData);
        //这里需要对数据进行过滤
        JSONArray resultData = filterNoAlertRes(data,arg1);
@@ -1614,7 +1615,7 @@
            }

            jsonObject.put("type", type);
            jsonObject.put("monitorData",jsonObject.getString("diff_val"));
            jsonObject.put("monitorData",jsonObject.getString("sy_val"));
            array.add(jsonObject);
        }
        return array;