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

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

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

@@ -47,8 +47,8 @@
    */
   @ApiOperation(value="告警记录-自定义分页列表查询", notes="告警记录-自定义分页列表查询")
   @GetMapping(value = "/page")
   public R page(AlarmRecordVO alarmRecord, Query query) {
      return R.data( alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
   public R selectAlarmPage(AlarmRecordVO alarmRecord, Query query) {
      return R.data(alarmRecordService.selectAlarmRecordPage(Condition.getPage(query),alarmRecord));
   }

   /**
@@ -111,4 +111,26 @@
      return R.data(alarmRecord);
   }

   /**
    * 按行政区统计告警-按三大类
    * @param alarmRecord
    * @return
    */
   @ApiOperation(value="告警记录-告警统计-按三大类", notes="告警记录-告警统计-按三大类")
   @GetMapping(value = "/statisticAlarmRecordByType")
   public R statisticAlarmRecordByType(AlarmRecordVO alarmRecord) {
      return R.data(alarmRecordService.statisticAlarmRecordByType(alarmRecord));
   }

   /**
    * 按行政区统计告警
    * @param alarmRecord
    * @return
    */
   @ApiOperation(value="告警记录-告警统计", notes="告警记录-告警统计")
   @GetMapping(value = "/statisticAlarmRecord")
   public R statisticAlarmRecord(AlarmRecordVO alarmRecord) {
      return R.data(alarmRecordService.statisticAlarmRecord(alarmRecord));
   }

}