Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2024-03-13 c8b03d3da4e29fc3fb9a42ca157738256c331a00

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/AlarmRecordService.java

@@ -28,9 +28,18 @@
   Object statisticAlarmRecordByType(AlarmRecordVO alarmRecord);

   /**
    * 查询大坝安全告警统计数据
    * @param alarmRecord
    * @return
    */
   Object statisticAlarmRecordByAlarmRuleType(AlarmRecordVO alarmRecord);

   /**
    * 按行政区统计告警
    * @param alarmRecord
    * @return
    */
   Object statisticAlarmRecord(AlarmRecordVO alarmRecord);

   Boolean updateStatus(AlarmRecord alarmRecord);
}