From cef04a8b5acdbe1d086fdc45d6c4a5b3b8df4a51 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 13 四月 2023 17:29:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
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 8f158e2..fe739ea 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
@@ -42,7 +42,9 @@
"asMessageChannel," +
"geoCoordSys," +
"treeType," +
- "online" +
+ "online," +
+ "mediaServerId," +
+ "(SELECT count(0) FROM device_channel WHERE deviceId=device.deviceId) as channelCount "+
" FROM device WHERE deviceId = #{deviceId}")
Device getDeviceByDeviceId(String deviceId);
@@ -159,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>"
@@ -167,9 +170,6 @@
@Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
int del(String deviceId);
-
- @Update("UPDATE device SET online=0")
- int outlineForAll();
@Select("SELECT " +
"deviceId, " +
@@ -255,7 +255,7 @@
"<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
"WHERE deviceId=#{deviceId}"+
" </script>"})
- int updateCustom(Device device);
+ void updateCustom(Device device);
@Insert("INSERT INTO device (" +
"deviceId, " +
@@ -269,7 +269,8 @@
"asMessageChannel," +
"geoCoordSys," +
"treeType," +
- "online" +
+ "online," +
+ "mediaServerId" +
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -282,7 +283,8 @@
"#{asMessageChannel}," +
"#{geoCoordSys}," +
"#{treeType}," +
- "#{online}" +
+ "#{online}," +
+ "#{mediaServerId}" +
")")
void addCustomDevice(Device device);
--
Gitblit v1.8.0