From 4cf2644b02f034171539214deb2d160005344d34 Mon Sep 17 00:00:00 2001 From: yang_shj <1069818635@QQ.com> Date: Fri, 28 Jun 2024 11:06:57 +0800 Subject: [PATCH] =?UTF-8?q?#=E6=99=BA=E8=83=BD=E9=A2=84=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/alarm/show/controller/ShowAlarmController.java | 6 +++--- .../com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java index 8deca55..d2988ee 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/controller/ShowAlarmController.java @@ -58,9 +58,9 @@ public class ShowAlarmController extends BladeController { @GetMapping("/alarmVideos") @ApiOperationSupport(order = 4) @ApiOperation(value = "站点") - public R> alarmVideos(@ApiParam("站点编号") @RequestParam String stationCode, - @ApiParam("设备编号") @RequestParam String deviceCode, - @ApiParam("监测点ID") @RequestParam String realId) { + public R> alarmVideos(@ApiParam("站点编号") @RequestParam(required = false) String stationCode, + @ApiParam("设备编号") @RequestParam(required = false) String deviceCode, + @ApiParam("监测点ID") @RequestParam(required = false) String realId) { return R.data(alarmService.alarmVideos(stationCode,deviceCode,realId)); } diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java index 5459860..51c8aa0 100644 --- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java +++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java @@ -458,6 +458,9 @@ public class AlarmServiceImpl extends BaseServiceImpl return alarmVideo; }).collect(Collectors.toList()); } + }else{ + // FIXME 查询FDP设备编号 + } } } @@ -466,7 +469,7 @@ public class AlarmServiceImpl extends BaseServiceImpl if(StringUtil.isNotBlank(deviceCode)){ // 查询设备绑定视频点位 R> videos = emVideoClient.getEmBandingVideos(deviceCode); - if(videos.isSuccess() && CollectionUtil.isEmpty(videos.getData())){ + if(videos.isSuccess() && CollectionUtil.isNotEmpty(videos.getData())){ return videos.getData().stream().distinct().map(video->{ AlarmVideoVo alarmVideo = new AlarmVideoVo(); alarmVideo.setVideoHost(video.getVideoHost());