From c73fe2b0cf2b0956b0f480aed2e5cb35ba446de5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 10:45:36 +0800
Subject: [PATCH] Merge pull request #787 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..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
@@ -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>"
@@ -270,6 +273,7 @@
"geoCoordSys," +
"treeType," +
"online" +
+ "mediaServerId" +
") VALUES (" +
"#{deviceId}," +
"#{name}," +
@@ -283,6 +287,7 @@
"#{geoCoordSys}," +
"#{treeType}," +
"#{online}" +
+ "#{mediaServerId}" +
")")
void addCustomDevice(Device device);
--
Gitblit v1.8.0