From 292c36f1c1397e6ba3f621ac43f521ab884551f2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 13 三月 2023 17:30:33 +0800
Subject: [PATCH] Merge pull request #774 from gaoxun1937/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 16 +++++++++++++---
1 files changed, 13 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 a0249e5..0aed820 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
@@ -61,6 +61,7 @@
"expires," +
"registerTime," +
"keepaliveTime," +
+ "keepaliveIntervalTime," +
"createTime," +
"updateTime," +
"charset," +
@@ -88,6 +89,7 @@
"#{expires}," +
"#{registerTime}," +
"#{keepaliveTime}," +
+ "#{keepaliveIntervalTime}," +
"#{createTime}," +
"#{updateTime}," +
"#{charset}," +
@@ -117,12 +119,15 @@
"<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, " +
@@ -150,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);
@@ -272,4 +280,6 @@
@Select("select count(1) as total, sum(online) as online from device")
ResourceBaceInfo getOverview();
+ @Select("select * from device")
+ List<Device> getAll();
}
--
Gitblit v1.8.0