From b2072073a93c9613ed7968db5d139b388ae7d90a Mon Sep 17 00:00:00 2001 From: lin <648540858@qq.com> Date: Thu, 20 Mar 2025 09:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BD=E6=A0=87=E7=BA=A7?= =?UTF-8?q?=E8=81=94=E6=8E=A8=E9=80=81=E4=BD=8D=E7=BD=AE=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java | 2 +- .../genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java | 4 ++++ .../iot/vmp/gb28181/service/impl/PlatformServiceImpl.java | 3 ++- .../notify/cmd/MobilePositionNotifyMessageHandler.java | 2 +- web_src/src/components/channelList.vue | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java index 755fc8876..39e121fdf 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java @@ -96,7 +96,7 @@ public class CommonGBChannel { private Double gpsDirection; @Schema(description = "") - private String gbGpsTime; + private String gpsTime; @Schema(description = "国标-虚拟组织所属的业务分组ID") private String gbBusinessGroupId; diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java index c69a32d5c..c437eee0f 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/PlatformChannelMapper.java @@ -262,6 +262,10 @@ public interface PlatformChannelMapper { " wdc.data_device_id,\n" + " wdc.create_time,\n" + " wdc.update_time,\n" + + " wdc.gps_altitude,\n" + + " wdc.gps_speed,\n" + + " wdc.gps_direction,\n" + + " wdc.gps_time,\n" + " coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" + " coalesce(wpgc.custom_name, wdc.gb_name, wdc.name) as gb_name,\n" + " coalesce(wpgc.custom_manufacturer, wdc.gb_manufacturer, wdc.manufacturer) as gb_manufacturer,\n" + diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java index af96adcd5..8f5f6223f 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformServiceImpl.java @@ -565,6 +565,7 @@ public class PlatformServiceImpl implements IPlatformService { gpsMsgInfo = null; } + if (gpsMsgInfo == null && !userSetting.isSendPositionOnDemand()){ gpsMsgInfo = new GPSMsgInfo(); gpsMsgInfo.setId(channel.getGbDeviceId()); @@ -573,7 +574,7 @@ public class PlatformServiceImpl implements IPlatformService { gpsMsgInfo.setAltitude(channel.getGpsAltitude()); gpsMsgInfo.setSpeed(channel.getGpsSpeed()); gpsMsgInfo.setDirection(channel.getGpsDirection()); - gpsMsgInfo.setTime(channel.getGbGpsTime()); + gpsMsgInfo.setTime(channel.getGpsTime()); } // 无最新位置不发送 diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java index f8bb55703..b25eef3d3 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MobilePositionNotifyMessageHandler.java @@ -78,7 +78,7 @@ public class MobilePositionNotifyMessageHandler extends SIPRequestProcessorParen String channelId = getText(rootElementAfterCharset, "DeviceID"); DeviceChannel deviceChannel = deviceChannelService.getOne(device.getDeviceId(), channelId); if (deviceChannel == null) { - log.warn("[解析报警消息] 未找到通道：{}/{}", device.getDeviceId(), channelId); + log.warn("[解析移动位置通知] 未找到通道：{}/{}", device.getDeviceId(), channelId); continue; } diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index f20ad566f..f62535908 100755 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -65,7 +65,7 @@ - +