xieb
2024-06-18 c8f22c297e1913a6f957d186900854b1375aa234
一个水库同个规则中保存一次处理
1 files modified
21 ■■■■■ changed files
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java 21 ●●●●● patch | view | raw | blame | history
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -575,11 +575,6 @@
        return format;
    }
    /**
     * 保存告警记录信息
     *
@@ -595,6 +590,7 @@
            .eq("reservoir_number", list.get(1))
            .eq("alarm_survey_station_code",list.get(0))
        );
        if (null != alarmRecord) {
            //删除测值
            list.remove(3);
@@ -613,8 +609,19 @@
            alarm.setMonitorData(list.get(3));
            //删除测值
            list.remove(3);
            // 新增
            boolean save = alarmRecordService.save(alarm);
            //一个水库同个规则中保存一次处理--Shit mountain code
            AlarmRecord alarmRecord2 = alarmRecordService.getOne(new QueryWrapper<AlarmRecord>()
                .eq("alarm_rule_id", alarmRule.getId())
                .eq("reservoir_number", list.get(1))
                .gt("create_time", DateUtil.format(new Date(),"yyyy-MM-dd"))
            );
            boolean save = true;
            if (null == alarmRecord2) {
                // 新增
                save = alarmRecordService.save(alarm);
            }
            // 删除测站编号
            list.remove(0);
            if (save) {