From 2de8db731cf98833691cff204f46f55e9f572cfe Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Fri, 7 Nov 2025 15:02:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A8=E6=B5=81=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=9B=B4=E6=96=B0=E6=97=B6=E5=9B=BD=E6=A0=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E9=94=99=E8=AF=AF=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java | 3 ++- .../iot/vmp/web/custom/service/CameraChannelService.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java index a653af876..3f5bcdcec 100755 --- a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java @@ -106,7 +106,8 @@ public interface StreamPushMapper { int getAllPushing(Boolean usePushingAsStatus); @MapKey("uniqueKey") - @Select("SELECT CONCAT(wsp.app, wsp.stream) as unique_key, wsp.*, wsp.* , wdc.id as gb_id " + + @Select("SELECT CONCAT(wsp.app, wsp.stream) as unique_key, wsp.*, wdc.* , " + + " wdc.id as gb_id " + " from wvp_stream_push wsp " + " LEFT join wvp_device_channel wdc on wdc.data_type = 2 and wsp.id = wdc.data_device_id") Map getAllAppAndStreamMap(); diff --git a/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java b/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java index a9eb82e79..9bf701843 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java +++ b/src/main/java/com/genersoft/iot/vmp/web/custom/service/CameraChannelService.java @@ -144,6 +144,9 @@ public class CameraChannelService implements CommandLineRunner { for (CommonGBChannel channel : channelList) { if (channel.getGbPtzType() != null && channel.getGbPtzType() == 99) { CommonGBChannel oldChannel = oldChannelMap.get(channel.getGbDeviceId()); + if (channel.getGbStatus() == null) { + channel.setGbStatus(oldChannel.getGbStatus()); + } if (oldChannel != null) { if (oldChannel.getGbPtzType() != null && oldChannel.getGbPtzType() == 99) { resultListForUpdate.add(channel); @@ -251,7 +254,7 @@ public class CameraChannelService implements CommandLineRunner { jsonObject.put("speed", mobilePosition.getSpeed()); jsonObject.put("topGroupGAlias", cameraChannel.getTopGroupGAlias()); jsonObject.put("groupAlias", cameraChannel.getGroupAlias()); - log.info("[redis发送通知] 发送 移动设备位置信息移动位置 {}: {}", REDIS_GPS_MESSAGE, jsonObject.toString()); + log.info("[SY-redis发送通知] 发送 移动设备位置信息移动位置 {}: {}", REDIS_GPS_MESSAGE, jsonObject.toString()); redisTemplate.convertAndSend(REDIS_GPS_MESSAGE, jsonObject); }