From b96d580168ed877fc4cf24f3208066d6fea6e114 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 十二月 2022 10:40:49 +0800
Subject: [PATCH] Merge pull request #689 from AlphaWu/Zafu-Dev-1129
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 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 03dba38..0e61692 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
@@ -1,6 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -23,6 +24,8 @@
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -51,6 +54,8 @@
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -76,6 +81,8 @@
"#{transport}," +
"#{streamMode}," +
"#{ip}," +
+ "#{sdpIp}," +
+ "#{localIp}," +
"#{port}," +
"#{hostAddress}," +
"#{expires}," +
@@ -104,6 +111,7 @@
"<if test=\"firmware != null\">, firmware='${firmware}'</if>" +
"<if test=\"transport != null\">, transport='${transport}'</if>" +
"<if test=\"ip != null\">, ip='${ip}'</if>" +
+ "<if test=\"localIp != null\">, localIp='${localIp}'</if>" +
"<if test=\"port != null\">, port=${port}</if>" +
"<if test=\"hostAddress != null\">, hostAddress='${hostAddress}'</if>" +
"<if test=\"online != null\">, online=${online}</if>" +
@@ -124,6 +132,8 @@
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -159,6 +169,8 @@
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -187,6 +199,8 @@
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -213,6 +227,7 @@
"<if test=\"password != null\">, password='${password}'</if>" +
"<if test=\"streamMode != null\">, streamMode='${streamMode}'</if>" +
"<if test=\"ip != null\">, ip='${ip}'</if>" +
+ "<if test=\"sdpIp != null\">, sdpIp='${sdpIp}'</if>" +
"<if test=\"port != null\">, port=${port}</if>" +
"<if test=\"charset != null\">, charset='${charset}'</if>" +
"<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
@@ -231,6 +246,7 @@
"deviceId, " +
"custom_name, " +
"password, " +
+ "sdpIp, " +
"createTime," +
"updateTime," +
"charset," +
@@ -242,6 +258,7 @@
"#{deviceId}," +
"#{name}," +
"#{password}," +
+ "#{sdpIp}," +
"#{createTime}," +
"#{updateTime}," +
"#{charset}," +
@@ -251,4 +268,8 @@
"#{online}" +
")")
void addCustomDevice(Device device);
+
+ @Select("select count(1) as total, sum(online) as online from device")
+ ResourceBaceInfo getOverview();
+
}
--
Gitblit v1.8.0