From 39ebdc0021889b05f2079780df141cbbe0df4345 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Wed, 24 Apr 2024 19:16:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=91=8A=E8=AD=A6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=91=E5=AE=9A=E8=A7=86=E9=A2=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzims/equipment/feign/EmVideoClient.java | 2 +- .../java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmVideoClient.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmVideoClient.java index 458e2a6..f1a6cf8 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmVideoClient.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/feign/EmVideoClient.java @@ -29,7 +29,7 @@ public class EmVideoClient implements IEmVideoClient{ @Override @GetMapping(GET_EM_BANDING_VIDEOS) public R> getEmBandingVideos(@RequestParam String emCodes) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery().in(EmVideoBandingEntity::getEmCode, Func.toLongList(",",emCodes)); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery().in(EmVideoBandingEntity::getEmCode, Func.toStrList(",",emCodes)); return R.data(emVideoBandingService.list(wrapper)); } 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 fdd96f2..2b769ec 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 @@ -248,6 +248,9 @@ public class AlarmServiceImpl extends BaseServiceImpl .filter(em -> this.isRealIdBanding(realId, em.getNumber())) .map(EmInfoEntity::getNumber) .collect(Collectors.joining(",")); + Assert.isTrue(StringUtil.isNotBlank(emCodes) && Func.isNotEmpty(emCodes), () -> { + throw new ServiceException("未获取到设备！"); + }); R> videoListR = emVideoClient.getEmBandingVideos(emCodes); Assert.isTrue(videoListR.isSuccess(), () -> { throw new ServiceException("获取设备绑定视频列表失败！");