648540858
2023-03-22 c85c99497212920327ebdca7f4f8b9cf2897f9d8
修复设备点播时指定流媒体
2个文件已修改
1个文件已添加
9 ■■■■■ 已修改文件
sql/2.6.7-2.6.8更新.sql 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/初始化.sql 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
sql/2.6.7-2.6.8更新.sql
New file
@@ -0,0 +1,4 @@
alter table device
    add mediaServerId varchar(50) default null;
sql/初始化.sql
@@ -32,6 +32,7 @@
                          `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,
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -43,6 +43,7 @@
            "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 @@
            "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 @@
            "geoCoordSys," +
            "treeType," +
            "online" +
            "mediaServerId" +
            ") VALUES (" +
            "#{deviceId}," +
            "#{name}," +
@@ -284,6 +287,7 @@
            "#{geoCoordSys}," +
            "#{treeType}," +
            "#{online}" +
            "#{mediaServerId}" +
            ")")
    void addCustomDevice(Device device);