ke
2024-04-22 41c8dd06fe3218e54314a58544d7cefe732fbdfb
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeHandle.java
@@ -237,6 +237,12 @@
            list.add(stcd);
            list.add(res_cd);
            list.add(personVO.getPhone());
            //拿测点值
            String val = "";
            JSONObject jsonObject = jsonArray.getJSONObject(i);
            val = jsonObject.getString("monitorData");
            list.add(val);
            if (flag) {
               // 如果是电话告警,需要把日期拼到一起
               if (alarmRuleDetail.getAlarmMode().equals("电话")) {
@@ -492,8 +498,11 @@
         .eq("temp_code", uuid)
         .eq("alarm_rule_id", alarmRule.getId())
         .eq("reservoir_number", list.get(1))
         .eq("alarm_survey_station_code",list.get(0))
      );
      if (null != alarmRecord) {
         //删除测值
         list.remove(3);
         // 删除测站编号
         list.remove(0);
         return alarmRecord;
@@ -506,6 +515,9 @@
         alarm.setReservoirNumber(list.get(1));
         alarm.setAlarmCondition(alarmRule.getRuleRemark());
         alarm.setTempCode(uuid);
         alarm.setMonitorData(list.get(3));
         //删除测值
         list.remove(3);
         // 新增
         boolean save = alarmRecordService.save(alarm);
         // 删除测站编号