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

ke

2024-07-19 08a962d2925baa255207fdf979e6fee794f1773b

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/damSecurity/controller/DamSecurityController.java

@@ -14,6 +14,7 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -147,12 +148,14 @@
   @ApiOperation(value = "大坝安全统计-大坝安全监测预警详情", notes = "大坝安全统计-大坝安全监测预警详情")
   @GetMapping(value = "/alarmDetailPage")
   public R alarmDetail(AlarmGetVO alarmGet,Query query){
      PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet);
      String ascs = StringUtil.isBlank(query.getAscs())?"":query.getAscs();
      String descs = StringUtil.isBlank(query.getDescs())?"":query.getDescs();
      PageVO<AlarmGetVO> page = nkyClient.getAlarmDetailPage(query.getCurrent(), query.getSize(), alarmGet,ascs,descs);
      return R.data(page);
   }

   /**
    * 大坝安全监测预警异常统计
    * 大坝安全监测预警异常统计-南科院
    * @param damStationStatistics
    * @return
    */
@@ -160,6 +163,20 @@
   @GetMapping(value = "/alarmResCount")
   public R alarmResCount(DamStationStatistics damStationStatistics,String basCodes){
      List<DamStationStatistics> list =  damSecurityService.alarmResCount(damStationStatistics,basCodes);
      return R.data(list);
   }

   /**
    * 大坝安全监测预警异常统计-中台预警
    * @param damMonitor
    * @return
    */
   @ApiOperation(value = "大坝安全统计-大坝安全监测预警异常统计", notes = "大坝安全统计-大坝安全监测预警异常统计")
   @GetMapping(value = "/alarmResCountZt")
   public R alarmResCountZt(DamMonitor damMonitor){
      if (StringUtil.isBlank(damMonitor.getStartTime()) || StringUtil.isBlank(damMonitor.getEndTime()))
         return R.fail("查询时间不能为空");
      List<DamStationStatistics> list =  damSecurityService.alarmResCount(damMonitor);
      return R.data(list);
   }

@@ -240,4 +257,10 @@
      return R.data(nkyClient.updateStatus(alarmGet));
   }

   @GetMapping("/getLatestResRecord")
   public R getLatestResRecord(AlarmGet alarmGet){
      List<AlarmGetVO> list = damSecurityService.getLatestResRecord(alarmGet);
      return R.data(list);
   }

}