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

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

   /**
@@ -61,6 +61,18 @@
   @PostMapping(value = "/add")
   public R add(@RequestBody AlarmRecord alarmRecord) {
      return R.data(alarmRecordService.save(alarmRecord));
   }

   /**
    * 添加
    *
    * @param alarmRecord
    * @return
    */
   @ApiOperation(value="告警记录-修改状态", notes="告警记录-修改状态")
   @PostMapping(value = "/updateStatus")
   public R updateStatus(@RequestBody AlarmRecord alarmRecord) {
      return R.data(alarmRecordService.updateStatus(alarmRecord));
   }

   /**
@@ -123,6 +135,23 @@
   }

   /**
    * 查询大坝安全告警统计数据
    * @param alarmRecord
    * @return
    */
   @ApiOperation(value="告警记录-告警统计-查询大坝安全告警统计数据", notes="告警记录-告警统计-查询大坝安全告警统计数据")
   @GetMapping(value = "/statisticAlarmRecordByAlarmRuleType")
   public R statisticAlarmRecordByAlarmRuleType(AlarmRecordVO alarmRecord) {
      return R.data(alarmRecordService.statisticAlarmRecordByAlarmRuleType(alarmRecord));
   }

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


   /**
    * 按行政区统计告警
    * @param alarmRecord
    * @return
@@ -133,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));
   }

}