From 913d4bdc8fbf74782b155b5e20dbda2398400c1f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 19 Dec 2023 23:17:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=89=E6=B5=81=E4=BB=A3?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/common/CommonGbChannel.java       |  10 +-
 .../cmd/impl/SIPCommanderFroPlatform.java     |   8 +-
 .../vmp/storager/dao/CommonChannelMapper.java | 132 +++++++++---------
 .../vmp/storager/dao/StreamProxyMapper.java   |   4 +-
 .../vmp/storager/dao/StreamPushMapper.java    |   2 +-
 5 files changed, 79 insertions(+), 77 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java b/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
index 009c1bf0..a8916ff4 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/CommonGbChannel.java
@@ -299,7 +299,7 @@ public class CommonGbChannel {
      * 时域编码能力,取值0:不支持;1:1级增强;2:2级增强;3:3级增强(可选)
      */
     @Schema(description = "空域编码能力,取值0:不支持;1:1级增强(1个增强层);2:2级增强(2个增强层);3:3级增强(3个增强层)(可选)")
-    private Integer SVCSpaceSupportMode;
+    private Integer commonGbSVCSpaceSupportMode;
 
     /**
      * 时域编码能力,取值0:不支持;1:1级增强;2:2级增强;3:3级增强(可选)
@@ -786,11 +786,11 @@ public class CommonGbChannel {
         return commonGbChannel;
     }
 
-    public Integer getSVCSpaceSupportMode() {
-        return SVCSpaceSupportMode;
+    public Integer getCommonGbSVCSpaceSupportMode() {
+        return commonGbSVCSpaceSupportMode;
     }
 
-    public void setSVCSpaceSupportMode(Integer SVCSpaceSupportMode) {
-        this.SVCSpaceSupportMode = SVCSpaceSupportMode;
+    public void setCommonGbSVCSpaceSupportMode(Integer commonGbSVCSpaceSupportMode) {
+        this.commonGbSVCSpaceSupportMode = commonGbSVCSpaceSupportMode;
     }
 }
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 ce4086a8..ac6bc43b 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
@@ -295,8 +295,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
                 if (!ObjectUtils.isEmpty(channel.getCommonGbDownloadSpeed())) {
                     catalogXml.append("<DownloadSpeed>" + channel.getCommonGbDownloadSpeed() + "</DownloadSpeed>\r\n");
                 }
-                if (!ObjectUtils.isEmpty(channel.getSVCSpaceSupportMode())) {
-                    catalogXml.append("<SVCSpaceSupportMode>" + channel.getSVCSpaceSupportMode() + "</SVCSpaceSupportMode>\r\n");
+                if (!ObjectUtils.isEmpty(channel.getCommonGbSVCSpaceSupportMode())) {
+                    catalogXml.append("<SVCSpaceSupportMode>" + channel.getCommonGbSVCSpaceSupportMode() + "</SVCSpaceSupportMode>\r\n");
                 }
                 if (!ObjectUtils.isEmpty(channel.getCommonGbSVCTimeSupportMode())) {
                     catalogXml.append("<SVCTimeSupportMode>" + channel.getCommonGbSVCTimeSupportMode() + "</SVCTimeSupportMode>\r\n");
@@ -654,8 +654,8 @@ public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform {
                 if (!ObjectUtils.isEmpty(channel.getCommonGbDownloadSpeed())) {
                     catalogXml.append("<DownloadSpeed>" + channel.getCommonGbDownloadSpeed() + "</DownloadSpeed>\r\n");
                 }
-                if (!ObjectUtils.isEmpty(channel.getSVCSpaceSupportMode())) {
-                    catalogXml.append("<SVCSpaceSupportMode>" + channel.getSVCSpaceSupportMode() + "</SVCSpaceSupportMode>\r\n");
+                if (!ObjectUtils.isEmpty(channel.getCommonGbSVCSpaceSupportMode())) {
+                    catalogXml.append("<SVCSpaceSupportMode>" + channel.getCommonGbSVCSpaceSupportMode() + "</SVCSpaceSupportMode>\r\n");
                 }
                 if (!ObjectUtils.isEmpty(channel.getCommonGbSVCTimeSupportMode())) {
                     catalogXml.append("<SVCTimeSupportMode>" + channel.getCommonGbSVCTimeSupportMode() + "</SVCTimeSupportMode>\r\n");
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java
index 237977d9..1be3b8e9 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java
@@ -76,82 +76,84 @@ public interface CommonChannelMapper {
     @Insert(value = "<script>" +
             "insert into wvp_common_channel ( " +
             "common_gb_device_id" +
-            " <if test='common_gb_name != null' > ,common_gb_name </if>" +
-            " <if test='common_gb_manufacturer != null' > ,common_gb_manufacturer </if>" +
-            " <if test='common_gb_model != null' > ,common_gb_model </if>" +
-            " <if test='common_gb_owner != null' > ,common_gb_owner </if>" +
-            " <if test='common_gb_civilCode != null' > ,common_gb_civilCode </if>" +
-            " <if test='common_gb_block != null' > ,common_gb_block </if>" +
-            " <if test='common_gb_address != null' > ,common_gb_address </if>" +
-            " <if test='common_gb_parental != null' > ,common_gb_parental </if>" +
-            " <if test='common_gb_parent_id != null' > ,common_gb_parent_id </if>" +
-            " <if test='common_gb_safety_way != null' > ,common_gb_safety_way </if>" +
-            " <if test='common_gb_register_way != null' > ,common_gb_register_way </if>" +
-            " <if test='common_gb_cert_num != null' > ,common_gb_cert_num </if>" +
-            " <if test='common_gb_certifiable != null' > ,common_gb_certifiable </if>" +
-            " <if test='common_gb_err_code != null' > ,common_gb_err_code </if>" +
-            " <if test='common_gb_end_time != null' > ,common_gb_end_time </if>" +
-            " <if test='common_gb_secrecy != null' > ,common_gb_secrecy </if>" +
-            " <if test='common_gb_ip_address != null' > ,common_gb_ip_address </if>" +
-            " <if test='common_gb_port != null' > ,common_gb_port </if>" +
-            " <if test='common_gb_password != null' > ,common_gb_password </if>" +
-            " <if test='common_gb_status != null' > ,common_gb_status </if>" +
-            " <if test='common_gb_longitude != null' > ,common_gb_longitude </if>" +
-            " <if test='common_gb_latitude != null' > ,common_gb_latitude </if>" +
-            " <if test='common_gb_ptz_type != null' > ,common_gb_ptz_type </if>" +
-            " <if test='common_gb_position_type != null' > ,common_gb_position_type </if>" +
-            " <if test='common_gb_room_type != null' > ,common_gb_room_type </if>" +
-            " <if test='common_gb_use_type != null' > ,common_gb_use_type </if>" +
-            " <if test='common_gb_supply_light_type != null' > ,common_gb_supply_light_type </if>" +
-            " <if test='common_gb_direction_type != null' > ,common_gb_direction_type </if>" +
-            " <if test='common_gb_resolution != null' > ,common_gb_resolution </if>" +
-            " <if test='common_gb_business_group_id != null' > ,common_gb_business_group_id </if>" +
-            " <if test='common_gb_download_speed != null' > ,common_gb_download_speed </if>" +
-            " <if test='common_gb_svc_time_support_mode != null' > ,common_gb_svc_time_support_mode </if>" +
+            " <if test='commonGbName != null' > ,common_gb_name </if>" +
+            " <if test='commonGbManufacturer != null' > ,common_gb_manufacturer </if>" +
+            " <if test='commonGbModel != null' > ,common_gb_model </if>" +
+            " <if test='commonGbOwner != null' > ,common_gb_owner </if>" +
+            " <if test='commonGbCivilCode != null' > ,common_gb_civilCode </if>" +
+            " <if test='commonGbBlock != null' > ,common_gb_block </if>" +
+            " <if test='commonGbAddress != null' > ,common_gb_address </if>" +
+            " <if test='commonGbParental != null' > ,common_gb_parental </if>" +
+            " <if test='commonGbParentID != null' > ,common_gb_parent_id </if>" +
+            " <if test='commonGbSafetyWay != null' > ,common_gb_safety_way </if>" +
+            " <if test='commonGbRegisterWay != null' > ,common_gb_register_way </if>" +
+            " <if test='commonGbCertNum != null' > ,common_gb_cert_num </if>" +
+            " <if test='commonGbCertifiable != null' > ,common_gb_certifiable </if>" +
+            " <if test='commonGbErrCode != null' > ,common_gb_err_code </if>" +
+            " <if test='commonGbEndTime != null' > ,common_gb_end_time </if>" +
+            " <if test='commonGbSecrecy != null' > ,common_gb_secrecy </if>" +
+            " <if test='commonGbIPAddress != null' > ,common_gb_ip_address </if>" +
+            " <if test='commonGbPort != null' > ,common_gb_port </if>" +
+            " <if test='commonGbPassword != null' > ,common_gb_password </if>" +
+            " <if test='commonGbStatus != null' > ,common_gb_status </if>" +
+            " <if test='commonGbLongitude != null' > ,common_gb_longitude </if>" +
+            " <if test='commonGbLatitude != null' > ,common_gb_latitude </if>" +
+            " <if test='commonGbPtzType != null' > ,common_gb_ptz_type </if>" +
+            " <if test='commonGbPositionType != null' > ,common_gb_position_type </if>" +
+            " <if test='commonGbRoomType != null' > ,common_gb_room_type </if>" +
+            " <if test='commonGbUseType != null' > ,common_gb_use_type </if>" +
+            " <if test='commonGbSupplyLightType != null' > ,common_gb_supply_light_type </if>" +
+            " <if test='commonGbDirectionType != null' > ,common_gb_direction_type </if>" +
+            " <if test='commonGbResolution != null' > ,common_gb_resolution </if>" +
+            " <if test='commonGbBusinessGroupID != null' > ,common_gb_business_group_id </if>" +
+            " <if test='commonGbDownloadSpeed != null' > ,common_gb_download_speed </if>" +
+            " <if test='commonGbSVCTimeSupportMode != null' > ,common_gb_svc_time_support_mode </if>" +
+            " <if test='commonGbSVCSpaceSupportMode != null' > ,common_gb_svc_space_support_mode </if>" +
             " <if test='type != null' > ,type </if>" +
             " <if test='updateTime != null' > ,update_time </if>" +
             " <if test='createTime != null' > ,create_time </if>" +
             ") values (" +
             "#{commonGbDeviceID}" +
-            " <if test='common_gb_name != null' > ,#{commonGbName}</if>" +
-            " <if test='common_gb_manufacturer != null' > ,#{commonGbManufacturer}</if>" +
-            " <if test='common_gb_model != null' > ,#{commonGbModel}</if>" +
-            " <if test='common_gb_owner != null' > ,#{commonGbOwner}</if>" +
-            " <if test='common_gb_civilCode != null' > ,#{commonGbCivilCode}</if>" +
-            " <if test='common_gb_block != null' > ,#{commonGbBlock}</if>" +
-            " <if test='common_gb_address != null' > ,#{commonGbAddress}</if>" +
-            " <if test='common_gb_parental != null' > ,#{commonGbParental}</if>" +
-            " <if test='common_gb_parent_id != null' > ,#{commonGbParentID}</if>" +
-            " <if test='common_gb_safety_way != null' > ,#{commonGbSafetyWay}</if>" +
-            " <if test='common_gb_register_way != null' > ,#{commonGbRegisterWay}</if>" +
-            " <if test='common_gb_cert_num != null' > ,#{commonGbCertNum}</if>" +
-            " <if test='common_gb_certifiable != null' > ,#{commonGbCertifiable}</if>" +
-            " <if test='common_gb_err_code != null' > ,#{commonGbErrCode}</if>" +
-            " <if test='common_gb_end_time != null' > ,#{commonGbEndTime}</if>" +
-            " <if test='common_gb_secrecy != null' > ,#{commonGbSecrecy}</if>" +
-            " <if test='common_gb_ip_address != null' > ,#{commonGbIPAddress}</if>" +
-            " <if test='common_gb_port != null' > ,#{commonGbPort}</if>" +
-            " <if test='common_gb_password != null' > ,#{commonGbPassword}</if>" +
-            " <if test='common_gb_status != null' > ,#{commonGbStatus}</if>" +
-            " <if test='common_gb_longitude != null' > ,#{commonGbLongitude}</if>" +
-            " <if test='common_gb_latitude != null' > ,#{commonGbLatitude}</if>" +
-            " <if test='common_gb_ptz_type != null' > ,#{commonGbPtzType}</if>" +
-            " <if test='common_gb_position_type != null' > ,#{commonGbPositionType}</if>" +
-            " <if test='common_gb_room_type != null' > ,#{commonGbRoomType}</if>" +
-            " <if test='common_gb_use_type != null' > ,#{commonGbUseType}</if>" +
-            " <if test='common_gb_supply_light_type != null' > ,#{commonGbSupplyLightType}</if>" +
-            " <if test='common_gb_direction_type != null' > ,#{commonGbDirectionType}</if>" +
-            " <if test='common_gb_resolution != null' > ,#{commonGbResolution}</if>" +
-            " <if test='common_gb_business_group_id != null' > ,#{commonGbBusinessGroupID}</if>" +
-            " <if test='common_gb_download_speed != null' > ,#{commonGbDownloadSpeed}</if>" +
-            " <if test='common_gb_svc_time_support_mode != null' > ,#{commonGbSVCTimeSupportMode}</if>" +
+            " <if test='commonGbName != null' > ,#{commonGbName}</if>" +
+            " <if test='commonGbManufacturer != null' > ,#{commonGbManufacturer}</if>" +
+            " <if test='commonGbModel != null' > ,#{commonGbModel}</if>" +
+            " <if test='commonGbOwner != null' > ,#{commonGbOwner}</if>" +
+            " <if test='commonGbCivilCode != null' > ,#{commonGbCivilCode}</if>" +
+            " <if test='commonGbBlock != null' > ,#{commonGbBlock}</if>" +
+            " <if test='commonGbAddress != null' > ,#{commonGbAddress}</if>" +
+            " <if test='commonGbParental != null' > ,#{commonGbParental}</if>" +
+            " <if test='commonGbParentID != null' > ,#{commonGbParentID}</if>" +
+            " <if test='commonGbSafetyWay != null' > ,#{commonGbSafetyWay}</if>" +
+            " <if test='commonGbRegisterWay != null' > ,#{commonGbRegisterWay}</if>" +
+            " <if test='commonGbCertNum != null' > ,#{commonGbCertNum}</if>" +
+            " <if test='commonGbCertifiable != null' > ,#{commonGbCertifiable}</if>" +
+            " <if test='commonGbErrCode != null' > ,#{commonGbErrCode}</if>" +
+            " <if test='commonGbEndTime != null' > ,#{commonGbEndTime}</if>" +
+            " <if test='commonGbSecrecy != null' > ,#{commonGbSecrecy}</if>" +
+            " <if test='commonGbIPAddress != null' > ,#{commonGbIPAddress}</if>" +
+            " <if test='commonGbPort != null' > ,#{commonGbPort}</if>" +
+            " <if test='commonGbPassword != null' > ,#{commonGbPassword}</if>" +
+            " <if test='commonGbStatus != null' > ,#{commonGbStatus}</if>" +
+            " <if test='commonGbLongitude != null' > ,#{commonGbLongitude}</if>" +
+            " <if test='commonGbLatitude != null' > ,#{commonGbLatitude}</if>" +
+            " <if test='commonGbPtzType != null' > ,#{commonGbPtzType}</if>" +
+            " <if test='commonGbPositionType != null' > ,#{commonGbPositionType}</if>" +
+            " <if test='commonGbRoomType != null' > ,#{commonGbRoomType}</if>" +
+            " <if test='commonGbUseType != null' > ,#{commonGbUseType}</if>" +
+            " <if test='commonGbSupplyLightType != null' > ,#{commonGbSupplyLightType}</if>" +
+            " <if test='commonGbDirectionType != null' > ,#{commonGbDirectionType}</if>" +
+            " <if test='commonGbResolution != null' > ,#{commonGbResolution}</if>" +
+            " <if test='commonGbBusinessGroupID != null' > ,#{commonGbBusinessGroupID}</if>" +
+            " <if test='commonGbDownloadSpeed != null' > ,#{commonGbDownloadSpeed}</if>" +
+            " <if test='commonGbSVCTimeSupportMode != null' > ,#{commonGbSVCTimeSupportMode}</if>" +
+            " <if test='commonGbSVCSpaceSupportMode != null' > ,#{commonGbSVCSpaceSupportMode}</if>" +
             " <if test='type != null' > ,#{type}</if>" +
             " <if test='updateTime != null' > ,#{updateTime}</if>" +
             " <if test='createTime != null' > ,#{createTime}</if>" +
             ")" +
             "</script>")
     @Options(useGeneratedKeys=true, keyProperty="commonGbId", keyColumn="common_gb_id")
-    int add(CommonGbChannel channel);
+    int add(CommonGbChannel commonGbChannel);
 
     @Delete("delete from wvp_common_channel where common_gb_device_id = #{channelId}")
     int deleteByDeviceID(String channelId);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
index eee3bfb9..07275b92 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
@@ -14,10 +14,10 @@ public interface StreamProxyMapper {
 
     @Insert("INSERT INTO wvp_stream_proxy (type, name, app, stream,media_server_id, url, src_url, dst_url, " +
             "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_audio, enable_mp4, enable, status, stream_key, " +
-            "enable_remove_none_reader, enable_disable_none_reader, create_time) VALUES " +
+            "enable_remove_none_reader, enable_disable_none_reader, create_time, longitude, latitude, common_gb_channel_id) VALUES " +
             "(#{type}, #{name}, #{app}, #{stream}, #{mediaServerId}, #{url}, #{srcUrl}, #{dstUrl}, " +
             "#{timeoutMs}, #{ffmpegCmdKey}, #{rtpType}, #{enableAudio}, #{enableMp4}, #{enable}, #{status}, #{streamKey}, " +
-            "#{enableRemoveNoneReader}, #{enableDisableNoneReader}, #{createTime} )")
+            "#{enableRemoveNoneReader}, #{enableDisableNoneReader}, #{createTime} , #{longitude} , #{latitude}, #{commonGbChannelId} )")
     int add(StreamProxy streamProxy);
 
     @Update("UPDATE wvp_stream_proxy " +
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
index a9dbe79e..c5884d89 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -109,7 +109,7 @@ public interface StreamPushMapper {
     @Select("SELECT * FROM wvp_stream_push WHERE media_server_id=#{mediaServerId}")
     List<StreamPush> selectAllByMediaServerId(String mediaServerId);
 
-    @Select("SELECT sp.* FROM wvp_stream_push sp WHERE sp.media_server_id=#{mediaServerId} and sp.gb_id is null")
+    @Select("SELECT * FROM wvp_stream_push WHERE media_server_id=#{mediaServerId} and gb_id is null")
     List<StreamPush> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
 
     @Update("UPDATE wvp_stream_push " +