From dfb87c768538e280cf5e17d1d5ee5bbed1e1888d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 25 十一月 2022 10:58:26 +0800
Subject: [PATCH] 合并主线
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 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 278392b..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;
@@ -16,12 +17,15 @@
@Select("SELECT " +
"deviceId, " +
"coalesce(custom_name, name) as name, " +
+ "password, " +
"manufacturer, " +
"model, " +
"firmware, " +
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -50,6 +54,8 @@
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -75,6 +81,8 @@
"#{transport}," +
"#{streamMode}," +
"#{ip}," +
+ "#{sdpIp}," +
+ "#{localIp}," +
"#{port}," +
"#{hostAddress}," +
"#{expires}," +
@@ -102,23 +110,14 @@
"<if test=\"model != null\">, model='${model}'</if>" +
"<if test=\"firmware != null\">, firmware='${firmware}'</if>" +
"<if test=\"transport != null\">, transport='${transport}'</if>" +
- "<if test=\"streamMode != null\">, streamMode='${streamMode}'</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>" +
"<if test=\"registerTime != null\">, registerTime='${registerTime}'</if>" +
"<if test=\"keepaliveTime != null\">, keepaliveTime='${keepaliveTime}'</if>" +
"<if test=\"expires != null\">, expires=${expires}</if>" +
- "<if test=\"charset != null\">, charset='${charset}'</if>" +
- "<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
- "<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=${subscribeCycleForMobilePosition}</if>" +
- "<if test=\"mobilePositionSubmissionInterval != null\">, mobilePositionSubmissionInterval=${mobilePositionSubmissionInterval}</if>" +
- "<if test=\"subscribeCycleForAlarm != null\">, subscribeCycleForAlarm=${subscribeCycleForAlarm}</if>" +
- "<if test=\"ssrcCheck != null\">, ssrcCheck=${ssrcCheck}</if>" +
- "<if test=\"geoCoordSys != null\">, geoCoordSys=#{geoCoordSys}</if>" +
- "<if test=\"treeType != null\">, treeType=#{treeType}</if>" +
- "<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
"WHERE deviceId='${deviceId}'"+
" </script>"})
int update(Device device);
@@ -126,12 +125,15 @@
@Select("SELECT " +
"deviceId, " +
"coalesce(custom_name, name) as name, " +
+ "password, " +
"manufacturer, " +
"model, " +
"firmware, " +
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -160,12 +162,15 @@
@Select("SELECT " +
"deviceId, " +
"coalesce(custom_name, name) as name, " +
+ "password, " +
"manufacturer, " +
"model, " +
"firmware, " +
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -181,18 +186,21 @@
"ssrcCheck," +
"geoCoordSys," +
"treeType," +
- "online" +
+ "online " +
" FROM device WHERE online = 1")
List<Device> getOnlineDevices();
@Select("SELECT " +
"deviceId, " +
"coalesce(custom_name, name) as name, " +
+ "password, " +
"manufacturer, " +
"model, " +
"firmware, " +
"transport," +
"streamMode," +
"ip," +
+ "sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -216,11 +224,11 @@
"UPDATE device " +
"SET updateTime='${updateTime}'" +
"<if test=\"name != null\">, custom_name='${name}'</if>" +
+ "<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=\"hostAddress != null\">, hostAddress='${hostAddress}'</if>" +
- "<if test=\"online != null\">, online=${online}</if>" +
"<if test=\"charset != null\">, charset='${charset}'</if>" +
"<if test=\"subscribeCycleForCatalog != null\">, subscribeCycleForCatalog=${subscribeCycleForCatalog}</if>" +
"<if test=\"subscribeCycleForMobilePosition != null\">, subscribeCycleForMobilePosition=${subscribeCycleForMobilePosition}</if>" +
@@ -233,4 +241,35 @@
"WHERE deviceId='${deviceId}'"+
" </script>"})
int updateCustom(Device device);
+
+ @Insert("INSERT INTO device (" +
+ "deviceId, " +
+ "custom_name, " +
+ "password, " +
+ "sdpIp, " +
+ "createTime," +
+ "updateTime," +
+ "charset," +
+ "ssrcCheck," +
+ "geoCoordSys," +
+ "treeType," +
+ "online" +
+ ") VALUES (" +
+ "#{deviceId}," +
+ "#{name}," +
+ "#{password}," +
+ "#{sdpIp}," +
+ "#{createTime}," +
+ "#{updateTime}," +
+ "#{charset}," +
+ "#{ssrcCheck}," +
+ "#{geoCoordSys}," +
+ "#{treeType}," +
+ "#{online}" +
+ ")")
+ void addCustomDevice(Device device);
+
+ @Select("select count(1) as total, sum(online) as online from device")
+ ResourceBaceInfo getOverview();
+
}
--
Gitblit v1.8.0