zhangk
2024-06-26 723bfb3eda20ad768eb2efb1aedc08d5b82b2318
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -598,10 +598,10 @@
         .eq("temp_code", uuid)
         .eq("alarm_rule_id", alarmRule.getId())
         .eq("reservoir_number", list.get(1))
         .eq("alarm_survey_station_code",list.get(0))
//         .eq("alarm_survey_station_code",list.get(0))
      );
      if (null != alarmRecord) {
      if (null!=alarmRecord) {
         //删除测值
         list.remove(3);
         // 删除测站编号
@@ -619,19 +619,8 @@
         alarm.setMonitorData(list.get(3));
         //删除测值
         list.remove(3);
         //一个水库同个规则中保存一次处理--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);
         }
         // 新增
         boolean save = alarmRecordService.save(alarm);
         // 删除测站编号
         list.remove(0);
         if (save) {
@@ -644,12 +633,12 @@
   public AlarmRecord saveAlarmRecord(List<String> list, AlarmRule alarmRule, String uuid, String remark) {
      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))
//         .eq("alarm_survey_station_code",list.get(0))
      );
      if (null != alarmRecord) {
      if (null!=alarmRecord) {
         //删除测值
         list.remove(3);
         // 删除测站编号