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/controller/AlarmRecordController.java

@@ -145,6 +145,12 @@
      return R.data(alarmRecordService.statisticAlarmRecordByAlarmRuleType(alarmRecord));
   }

   @GetMapping(value = "/statisticsPie")
   public R statisticsPie(AlarmRecordVO alarmRecordVO){
      return R.data(alarmRecordService.statisticsPie(alarmRecordVO));
   }


   /**
    * 按行政区统计告警
    * @param alarmRecord
@@ -156,4 +162,15 @@
      return R.data(alarmRecordService.statisticAlarmRecord(alarmRecord));
   }

   /**
    * 告警统计按告警分类-等级统计
    * @param alarmRecord
    * @return
    */
   @ApiOperation(value="告警记录-告警统计按告警分类-等级统计", notes="告警记录-告警统计按告警分类-等级统计")
   @GetMapping(value = "/statisticAlaByTypeAndLev")
   public R statisticAlaByTypeAndLev(AlarmRecordVO alarmRecord) {
      return R.data(alarmRecordService.statisticAlaByTypeAndLev(alarmRecord));
   }

}