移除自定义的是否支持云台属性

src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonGBChannel.java

@@ -153,9 +153,6 @@ public class CommonGBChannel {
     @Schema(description = "流唯一编号，存在表示正在直播")
     private String  streamId;
 
-    @Schema(description = "是否支持云台控制 1支持,0不支持")
-    private Integer enablePtz;
-
     @Schema(description = "是否支持对讲 1支持,0不支持")
     private Integer enableBroadcast;
 
@@ -346,9 +343,6 @@ public class CommonGBChannel {
                 if (this.getGbSvcTimeSupportMode() != null) {
                     content.append("  <SVCTimeSupportMode>" + this.getGbSvcTimeSupportMode() + "</SVCTimeSupportMode>\n");
                 }
-                if (this.getEnablePtz() != null) {
-                    content.append("  <EnablePtz>" + this.getEnablePtz() + "</EnablePtz>\n");
-                }
                 if (this.getEnableBroadcast() != null) {
                     content.append("  <EnableBroadcast>" + this.getEnableBroadcast() + "</EnableBroadcast>\n");
                 }

src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java

@@ -237,13 +237,6 @@ public class DeviceChannel extends CommonGBChannel {
 			deviceChannel.setHasAudio(true);
             if (deviceChannel.getEnableBroadcast() == null && "138".equals(gbCode.getTypeCode())) {
                 deviceChannel.setEnableBroadcast(1);
-            }
-            if (deviceChannel.getEnablePtz() == null && (
-                    deviceChannel.getPtzType() == 1
-                    || deviceChannel.getPtzType() == 4
-                    || deviceChannel.getPtzType() == 5
-            )) {
-                deviceChannel.setEnablePtz(1);
             }
 		}
 

src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java

@@ -58,7 +58,6 @@ public interface CommonGBChannelMapper {
             "gb_download_speed," +
             "gb_svc_space_support_mod," +
             "gb_svc_time_support_mode," +
-            "enable_ptz," +
             "enable_broadcast ) " +
             "VALUES (" +
             "#{gbDeviceId}, " +
@@ -99,7 +98,6 @@ public interface CommonGBChannelMapper {
             "#{gbDownloadSpeed},"+
             "#{gbSvcSpaceSupportMod},"+
             "#{gbSvcTimeSupportMode},"+
-            "#{enablePtz},"+
             "#{enableBroadcast}"+
             ")" +
             " </script>")
@@ -148,7 +146,6 @@ public interface CommonGBChannelMapper {
             ", gb_download_speed = #{gbDownloadSpeed}" +
             ", gb_svc_space_support_mod = #{gbSvcSpaceSupportMod}" +
             ", gb_svc_time_support_mode = #{gbSvcTimeSupportMode}" +
-            ", enable_ptz = #{enablePtz}" +
             ", enable_broadcast = #{enableBroadcast}" +
             " WHERE id = #{gbId}"+
             " </script>"})
@@ -212,7 +209,6 @@ public interface CommonGBChannelMapper {
             "gb_download_speed," +
             "gb_svc_space_support_mod," +
             "gb_svc_time_support_mode," +
-            "enable_ptz," +
             "enable_broadcast ) " +
             "VALUES" +
             "<foreach collection='commonGBChannels' index='index' item='item' separator=','> " +
@@ -222,7 +218,7 @@ public interface CommonGBChannelMapper {
             "#{item.gbRegisterWay},#{item.gbCertNum},#{item.gbCertifiable},#{item.gbErrCode},#{item.gbEndTime}, #{item.gbSecrecy},#{item.gbIpAddress}," +
             "#{item.gbPort},#{item.gbPassword},#{item.gbStatus},#{item.gbLongitude}, #{item.gbLatitude},#{item.gbPtzType},#{item.gbPositionType},#{item.gbRoomType}," +
             "#{item.gbUseType},#{item.gbSupplyLightType},#{item.gbDirectionType},#{item.gbResolution},#{item.gbBusinessGroupId},#{item.gbDownloadSpeed}," +
-            "#{item.gbSvcSpaceSupportMod},#{item.gbSvcTimeSupportMode},#{item.enablePtz},#{item.enableBroadcast})" +
+            "#{item.gbSvcSpaceSupportMod},#{item.gbSvcTimeSupportMode},#{item.enableBroadcast})" +
             "</foreach> " +
             " </script>")
     int batchAdd(List<CommonGBChannel> commonGBChannels);
@@ -432,7 +428,6 @@ public interface CommonGBChannelMapper {
             ", gb_download_speed=#{item.gbDownloadSpeed}" +
             ", gb_svc_space_support_mod=#{item.gbSvcSpaceSupportMod}" +
             ", gb_svc_time_support_mode=#{item.gbSvcTimeSupportMode}" +
-            ", enable_ptz = #{enablePtz}" +
             ", enable_broadcast = #{enableBroadcast}" +
             " WHERE id=#{item.gbId}" +
             "</foreach>" +
@@ -515,7 +510,6 @@ public interface CommonGBChannelMapper {
             "    wdc.create_time,\n" +
             "    wdc.update_time,\n" +
             "    wdc.record_plan_id,\n" +
-            "    wdc.enable_ptz,\n" +
             "    wdc.enable_broadcast,\n" +
             "    coalesce( wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" +
             "    coalesce( wdc.gb_name, wdc.name) as gb_name,\n" +

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java

@@ -18,7 +18,6 @@ public class ChannelProvider {
             "    update_time,\n" +
             "    stream_id,\n" +
             "    record_plan_id,\n" +
-            "    enable_ptz,\n" +
             "    enable_broadcast,\n" +
             "    coalesce(gb_device_id, device_id) as gb_device_id,\n" +
             "    coalesce(gb_name, name) as gb_name,\n" +
@@ -65,7 +64,6 @@ public class ChannelProvider {
             "    wdc.update_time,\n" +
             "    wdc.stream_id,\n" +
             "    wdc.record_plan_id,\n" +
-            "    wdc.enable_ptz,\n" +
             "    wdc.enable_broadcast,\n" +
             "    coalesce(wdc.gb_device_id,  wdc.device_id) as gb_device_id,\n" +
             "    coalesce(wdc.gb_name,  wdc.name) as gb_name,\n" +
@@ -111,7 +109,6 @@ public class ChannelProvider {
             "    wdc.data_device_id,\n" +
             "    wdc.create_time,\n" +
             "    wdc.update_time,\n" +
-            "    wdc.enable_ptz,\n" +
             "    wdc.enable_broadcast,\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" +

src/main/java/com/genersoft/iot/vmp/streamPush/bean/RedisPushStreamMessage.java

@@ -14,6 +14,12 @@ public class RedisPushStreamMessage {
     private String groupGbId;
     // 终端所属的虚拟组织别名 可选，可作为地方同步组织结构到wvp时的关联关系
     private String groupAlias;
+    // 生产商
+    private String manufacturer;
+    // 设备型号
+    private String model;
+    // 摄像机类型
+    private Integer ptzType;
 
     public StreamPush buildstreamPush() {
         StreamPush push = new StreamPush();
@@ -22,6 +28,9 @@ public class RedisPushStreamMessage {
         push.setGbName(name);
         push.setGbDeviceId(gbId);
         push.setStartOfflinePush(true);
+        push.setGbManufacturer(manufacturer);
+        push.setGbModel(model);
+        push.setGbPtzType(ptzType);
         push.setGbStatus(status?"ON":"OFF");
         return push;
     }

src/main/java/com/genersoft/iot/vmp/web/custom/ChannelController.java

@@ -0,0 +1,12 @@
+package com.genersoft.iot.vmp.web.custom;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping(value = "/api/sy")
+public class ChannelController {
+
+}