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/mapper/AlarmRecordMapper.java

@@ -26,6 +26,8 @@
    */
    List<AlarmRecordVO> selectAlarmRecordPage(IPage<AlarmRecordVO> page,@Param("alarmRecord") AlarmRecordVO alarmRecord);

   AlarmRecordVO getVODetail(@Param("id") Long id);

   /**
    * 查询告警统计数据-按三大类
    * @param alarmRecord
@@ -33,6 +35,14 @@
    */
   @InterceptorIgnore(tenantLine = "true")
   List<StatisticAlarmRecord> statisticAlarmRecordByType(@Param("alarmRecord") AlarmRecordVO alarmRecord);

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

   /**
    * 查询告警统计数据
@@ -49,9 +59,18 @@
   List<String> getAdNameList(@Param("adCode") String adCode);

   /**
    * 按行政区code行政区
    * @param adCode
    * @return
    */
   List<String> getAdNameListByAdCode(@Param("adCode") String adCode);

   /**
    * 查询符合条件的告警类型
    * @param alarmRecord
    * @return
    */
   List<AlarmRule> listAlarmRule(@Param("alarmRecord") AlarmRecordVO alarmRecord);


}