From 09a23bc80e017e73160c3fba89f609fe045f5748 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 05 一月 2023 17:49:34 +0800
Subject: [PATCH] 修复布防撤防 #717
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 9bf5c02..048206a 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
@@ -25,6 +25,7 @@
"streamMode," +
"ip," +
"sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -54,11 +55,13 @@
"streamMode," +
"ip," +
"sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
"registerTime," +
"keepaliveTime," +
+ "keepaliveIntervalTime," +
"createTime," +
"updateTime," +
"charset," +
@@ -80,11 +83,13 @@
"#{streamMode}," +
"#{ip}," +
"#{sdpIp}," +
+ "#{localIp}," +
"#{port}," +
"#{hostAddress}," +
"#{expires}," +
"#{registerTime}," +
"#{keepaliveTime}," +
+ "#{keepaliveIntervalTime}," +
"#{createTime}," +
"#{updateTime}," +
"#{charset}," +
@@ -108,17 +113,21 @@
"<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>" +
"<if test=\"registerTime != null\">, registerTime='${registerTime}'</if>" +
"<if test=\"keepaliveTime != null\">, keepaliveTime='${keepaliveTime}'</if>" +
+ "<if test=\"keepaliveIntervalTime != null\">, keepaliveIntervalTime='${keepaliveIntervalTime}'</if>" +
"<if test=\"expires != null\">, expires=${expires}</if>" +
"WHERE deviceId='${deviceId}'"+
" </script>"})
int update(Device device);
- @Select("SELECT " +
+ @Select(
+ " <script>" +
+ "SELECT " +
"deviceId, " +
"coalesce(custom_name, name) as name, " +
"password, " +
@@ -129,6 +138,7 @@
"streamMode," +
"ip," +
"sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -145,8 +155,11 @@
"geoCoordSys," +
"treeType," +
"online," +
- "(SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount FROM device de")
- List<Device> getDevices();
+ "(SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount FROM device de" +
+ "<if test=\"online != null\"> where online=${online}</if>"+
+ " </script>"
+ )
+ List<Device> getDevices(Boolean online);
@Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
int del(String deviceId);
@@ -165,6 +178,7 @@
"streamMode," +
"ip," +
"sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
@@ -194,6 +208,7 @@
"streamMode," +
"ip," +
"sdpIp," +
+ "localIp," +
"port," +
"hostAddress," +
"expires," +
--
Gitblit v1.8.0