From c85c99497212920327ebdca7f4f8b9cf2897f9d8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 15:21:22 +0800
Subject: [PATCH] 修复设备点播时指定流媒体
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 4 ++++
sql/2.6.7-2.6.8更新.sql | 4 ++++
sql/初始化.sql | 1 +
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git "a/sql/2.6.7-2.6.8\346\233\264\346\226\260.sql" "b/sql/2.6.7-2.6.8\346\233\264\346\226\260.sql"
new file mode 100755
index 0000000..208f0bf
--- /dev/null
+++ "b/sql/2.6.7-2.6.8\346\233\264\346\226\260.sql"
@@ -0,0 +1,4 @@
+alter table device
+ add mediaServerId varchar(50) default null;
+
+
diff --git "a/sql/\345\210\235\345\247\213\345\214\226.sql" "b/sql/\345\210\235\345\247\213\345\214\226.sql"
index a8dfaff..7b8be66 100644
--- "a/sql/\345\210\235\345\247\213\345\214\226.sql"
+++ "b/sql/\345\210\235\345\247\213\345\214\226.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,
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index b30ca19..fcd59b0 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/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);
--
Gitblit v1.8.0