xieb
2024-06-03 f354bd527fedd083da88fb3c36b7f6491e881a99
变形值大于100mm
3 files modified
33 ■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java 3 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java 24 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java 6 ●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/constant/ZtApiDataColumnConstant.java
@@ -447,6 +447,9 @@
        add("cd_nm");
        add("direction");
        add("val");
        add("de_val");
        add("dn_val");
        add("du_value");
    }};
    /**
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -1915,7 +1915,7 @@
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);
                String remark = StringUtil.format("de_val:{}\ndn_val:{}\ndu_value:{}\n",
                String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
                    list.get(13), list.get(14), list.get(15)
                );
                list.remove(13);
@@ -1999,7 +1999,7 @@
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);
                String remark = StringUtil.format("de_val:{}\ndn_val:{}\ndu_value:{}\n",
                String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
                    list.get(13), list.get(14), list.get(15)
                );
                list.remove(13);
@@ -2044,8 +2044,16 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);
                String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
                    list.get(13), list.get(14), list.get(15)
                );
                list.remove(13);
                list.remove(14);
                list.remove(15);
                // 保存告警记录信息
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
                AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid, remark);
                if (null != alarmRecord) {
                    list.add(alarmRecord.getId().toString());
                }
@@ -2082,8 +2090,16 @@
                noticeHandle.addPatrolTechnologyInfo(list, false);
                // 拼接市县水利部人员姓名及联系方式
                noticeHandle.addCityCountyBusinessPersonInfo(list);
                String remark = StringUtil.format("上下游:{}\n左右岸:{}\n垂直位移:{}\n",
                    list.get(13), list.get(14), list.get(15)
                );
                list.remove(13);
                list.remove(14);
                list.remove(15);
                // 保存告警记录信息
                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/NoticeStrategyImpl.java
@@ -1233,7 +1233,7 @@
    /**
     * 近1h变形值大于10cm以上
     * 变形值大于100mm
     *
     * @param arg1
     * @param arg2
@@ -1246,7 +1246,7 @@
        // 查询当前策略对应的告警规则信息
        AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
        // 调用中台服务接口查询数据
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_value_1h_change_over_10_api);
        JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.alarm_db_wy_value_api);
        JSONArray data = judgeDirection(ztData, "3");
@@ -1577,7 +1577,7 @@
            //左右岸方向
            Double dnVal = jsonObject.getDouble("dn_val");
            //垂直
            Double duValue = jsonObject.getDouble("du_value");
            Double duValue = jsonObject.getDouble("垂直位移");
            String direction = "";
            String val = "";