Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

2.6.7
648540858 2023-03-22 10:31:45 +08:00
parent 66234dc288
commit c85c994972
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/2.6.7-2.6.8更新.sql Executable file
View File

@ -0,0 +1,4 @@
alter table device
add mediaServerId varchar(50) default null;

1
sql/初始化.sql
View File

@ -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,

4
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
View File

@ -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);