修复设备点播时指定流媒体

648540858
1 parent 66234dc2
Showing 3 changed files with 9 additions and 0 deletions
sql/2.6.7-2.6.8更新.sql
sql/初始化.sql
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+alter table device
+    add mediaServerId varchar(50) default null;
+
+
@@ -32,6 +32,7 @@ CREATE TABLE `device` (
                           `transport` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
                           `streamMode` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
                           `online` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
+                          `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
                           `registerTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
                           `keepaliveTime` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
                           `ip` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
@@ -43,6 +43,7 @@ public interface DeviceMapper {
             "geoCoordSys," +
             "treeType," +
             "online," +
+            "mediaServerId," +
             "(SELECT count(0) FROM device_channel WHERE deviceId=device.deviceId) as channelCount "+
             " FROM device WHERE deviceId = #{deviceId}")
     Device getDeviceByDeviceId(String deviceId);
@@ -160,6 +161,7 @@ public interface DeviceMapper {
             "geoCoordSys," +
             "treeType," +
             "online," +
+            "mediaServerId," +
             "(SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount  FROM device de" +
             "<if test=\"online != null\"> where online=${online}</if>"+
             " </script>"
@@ -271,6 +273,7 @@ public interface DeviceMapper {
             "geoCoordSys," +
             "treeType," +
             "online" +
+            "mediaServerId" +
             ") VALUES (" +
             "#{deviceId}," +
             "#{name}," +
@@ -284,6 +287,7 @@ public interface DeviceMapper {
             "#{geoCoordSys}," +
             "#{treeType}," +
             "#{online}" +
+            "#{mediaServerId}" +
             ")")
     void addCustomDevice(Device device);