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

guoshilong

2024-03-06 1a5bfb9a86393572f1d6de6eacbcee682be32b46

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

@@ -37,6 +37,14 @@
   List<StatisticAlarmRecord> statisticAlarmRecordByType(@Param("alarmRecord") AlarmRecordVO alarmRecord);

   /**
    * 查询大坝安全告警统计数据
    * @param alarmRecord
    * @return
    */
   @InterceptorIgnore(tenantLine = "true")
   List<StatisticAlarmRecord> statisticAlarmRecordByAlarmRuleType(@Param("alarmRecord") AlarmRecordVO alarmRecord);

   /**
    * 查询告警统计数据
    * @param alarmRecord
    * @return