From e886aa483373ccb85d964675b118ca9f0e27ee9c Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 27 Mar 2024 11:15:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPTZType=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E5=A3=B0=E9=9F=B3=E5=BC=80=E5=85=B3=E5=A4=B1=E6=95=88=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 8 ++++---- .../transmit/cmd/impl/SIPCommanderFroPlatform.java | 4 ++-- .../iot/vmp/storager/dao/DeviceChannelMapper.java | 10 +++++----- web_src/src/components/common/DeviceTree.vue | 6 +++--- web_src/src/components/dialog/channelMapInfobox.vue | 2 +- web_src/src/components/map.vue | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java index 43a5d48e..32b6fac0 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java @@ -447,16 +447,16 @@ public class DeviceChannel { this.password = password; } - public int getPTZType() { + public int getPtzType() { return ptzType; } - public String getPTZTypeText() { + public String getPtzTypeText() { return ptzTypeText; } - public void setPTZTypeText(String PTZTypeText) { - this.ptzTypeText = PTZTypeText; + public void setPtzTypeText(String ptzTypeText) { + this.ptzTypeText = ptzTypeText; } public boolean isStatus() { diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java index abd32fba..29646546 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java @@ -358,8 +358,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { }else { catalogXml.append("\r\n"); } - if (!ObjectUtils.isEmpty(channel.getPTZType())) { - catalogXml.append("" + channel.getPTZType() + "\r\n"); + if (!ObjectUtils.isEmpty(channel.getPtzType())) { + catalogXml.append("" + channel.getPtzType() + "\r\n"); }else { catalogXml.append("\r\n"); } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java index e823c6e0..c751b919 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java @@ -23,7 +23,7 @@ public interface DeviceChannelMapper { "longitude_wgs84, latitude_wgs84, has_audio, create_time, update_time, business_group_id, gps_time, stream_identification) " + "VALUES (#{channelId}, #{deviceId}, #{name}, #{manufacture}, #{model}, #{owner}, #{civilCode}, #{block}," + "#{address}, #{parental}, #{parentId}, #{safetyWay}, #{registerWay}, #{certNum}, #{certifiable}, #{errCode}, #{secrecy}, " + - "#{ipAddress}, #{port}, #{password}, #{PTZType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " + + "#{ipAddress}, #{port}, #{password}, #{ptzType}, #{status}, #{streamId}, #{longitude}, #{latitude}, #{longitudeGcj02}, " + "#{latitudeGcj02}, #{longitudeWgs84}, #{latitudeWgs84}, #{hasAudio}, #{createTime}, #{updateTime}, #{businessGroupId}, #{gpsTime}, #{streamIdentification})") int add(DeviceChannel channel); @@ -48,7 +48,7 @@ public interface DeviceChannelMapper { ", ip_address=#{ipAddress}" + ", port=#{port}" + ", password=#{password}" + - ", custom_ptz_type=#{PTZType}" + + ", custom_ptz_type=#{ptzType}" + ", status=#{status}" + ", stream_id=#{streamId}" + ", has_audio=#{hasAudio}" + @@ -250,7 +250,7 @@ public interface DeviceChannelMapper { "#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," + "#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " + "#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " + - "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " + + "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.ptzType}, #{item.status}, " + "#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " + "#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " + "#{item.businessGroupId}, #{item.gpsTime}, #{item.streamIdentification}) " + @@ -271,7 +271,7 @@ public interface DeviceChannelMapper { "#{item.owner}, #{item.civilCode}, #{item.block},#{item.subCount}," + "#{item.address}, #{item.parental}, #{item.parentId}, #{item.safetyWay}, #{item.registerWay}, " + "#{item.certNum}, #{item.certifiable}, #{item.errCode}, #{item.secrecy}, " + - "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.PTZType}, #{item.status}, " + + "#{item.ipAddress}, #{item.port}, #{item.password}, #{item.ptzType}, #{item.status}, " + "#{item.streamId}, #{item.longitude}, #{item.latitude},#{item.longitudeGcj02}, " + "#{item.latitudeGcj02},#{item.longitudeWgs84}, #{item.latitudeWgs84}, #{item.hasAudio}, now(), now(), " + "#{item.businessGroupId}, #{item.gpsTime}) " + @@ -339,7 +339,7 @@ public interface DeviceChannelMapper { ", ip_address=#{item.ipAddress}" + ", port=#{item.port}" + ", password=#{item.password}" + - ", ptz_type=#{item.PTZType}" + + ", ptz_type=#{item.ptzType}" + ", status=#{item.status}" + ", stream_id=#{item.streamId}" + ", has_audio=#{item.hasAudio}" + diff --git a/web_src/src/components/common/DeviceTree.vue b/web_src/src/components/common/DeviceTree.vue index c701bf0f..6030dc8a 100755 --- a/web_src/src/components/common/DeviceTree.vue +++ b/web_src/src/components/common/DeviceTree.vue @@ -131,11 +131,11 @@ export default { type = 2; } console.log(type) - if (item.basicData.ptztype === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机 + if (item.basicData.ptzType === 1 ) { // 1-球机;2-半球;3-固定枪机;4-遥控枪机 type = 4; - }else if (item.basicData.ptztype === 2) { + }else if (item.basicData.ptzType === 2) { type = 5; - }else if (item.basicData.ptztype === 3 || item.basicData.ptztype === 4) { + }else if (item.basicData.ptzType === 3 || item.basicData.ptzType === 4) { type = 6; } }else { diff --git a/web_src/src/components/dialog/channelMapInfobox.vue b/web_src/src/components/dialog/channelMapInfobox.vue index 2ef0e529..fa7ae5c9 100755 --- a/web_src/src/components/dialog/channelMapInfobox.vue +++ b/web_src/src/components/dialog/channelMapInfobox.vue @@ -7,7 +7,7 @@ {{channel.owner}} {{channel.civilCode}} {{channel.address}} - {{channel.ptztypeText}} + {{channel.ptzTypeText}} {{channel.longitude}},{{channel.latitude}} 在线 diff --git a/web_src/src/components/map.vue b/web_src/src/components/map.vue index 248426ce..64ae0e2d 100755 --- a/web_src/src/components/map.vue +++ b/web_src/src/components/map.vue @@ -243,7 +243,7 @@ export default { }, getImageByChannel: function (channel) { let src = "static/images/gis/camera.png" - switch (channel.ptztype) { + switch (channel.ptzType) { case 1: if (channel.status === 1) { src = "static/images/gis/camera1.png" From 0f18d4cbe1039681ff53288317465f1e6a587232 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 27 Mar 2024 16:20:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dredis=E6=8E=A8=E6=B5=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A8=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/redisMsg/RedisPushStreamStatusListMsgListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java index 65239c8f..47da9699 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java +++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java @@ -88,7 +88,8 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { streamPushItemForSave.add(streamPushItem); allGBId.put(streamPushItem.getGbId(), streamPushItem); } else { - if (allGBId.containsKey(streamPushItem.getGbId())) { + if (allGBId.containsKey(streamPushItem.getGbId()) + && (allGBId.get(streamPushItem.getGbId()).getApp().equals(streamPushItem.getApp()) || allGBId.get(streamPushItem.getGbId()).getStream().equals(streamPushItem.getStream()))) { GbStream gbStream = allGBId.get(streamPushItem.getGbId()); logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}", streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream()); From a2b1065fe9aea25b82b756580ff3379ac4378ad1 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Wed, 27 Mar 2024 16:51:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dredis=E6=8E=A8=E6=B5=81?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A8=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/redisMsg/RedisPushStreamStatusListMsgListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java index 47da9699..dc342b02 100755 --- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java +++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamStatusListMsgListener.java @@ -89,7 +89,7 @@ public class RedisPushStreamStatusListMsgListener implements MessageListener { allGBId.put(streamPushItem.getGbId(), streamPushItem); } else { if (allGBId.containsKey(streamPushItem.getGbId()) - && (allGBId.get(streamPushItem.getGbId()).getApp().equals(streamPushItem.getApp()) || allGBId.get(streamPushItem.getGbId()).getStream().equals(streamPushItem.getStream()))) { + && (!allGBId.get(streamPushItem.getGbId()).getApp().equals(streamPushItem.getApp()) || !allGBId.get(streamPushItem.getGbId()).getStream().equals(streamPushItem.getStream()))) { GbStream gbStream = allGBId.get(streamPushItem.getGbId()); logger.warn("[REDIS消息-推流设备列表更新-UPDATE] 国标编号重复: {}, 已分配给{}/{}", streamPushItem.getGbId(), gbStream.getApp(), gbStream.getStream());