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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

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

@@ -28,6 +28,13 @@
   Object statisticAlarmRecordByType(AlarmRecordVO alarmRecord);

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

   /**
    * 按行政区统计告警
    * @param alarmRecord
    * @return
@@ -35,4 +42,13 @@
   Object statisticAlarmRecord(AlarmRecordVO alarmRecord);

   Boolean updateStatus(AlarmRecord alarmRecord);

   Object statisticsPie(AlarmRecordVO alarmRecordVO);

   /**
    * 告警统计按告警分类-等级统计
    * @param alarmRecord
    * @return
    */
   Object statisticAlaByTypeAndLev(AlarmRecordVO alarmRecord);
}