From 7145ce07e6a84854fc1e5afd65b664c54a47bffd Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 20 四月 2022 14:16:10 +0800
Subject: [PATCH] Merge pull request #439 from hotcoffie/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 24 +++++++++++++++++++++---
1 files changed, 21 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 4fac2c1..97cf2cc 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
@@ -32,6 +32,12 @@
"keepaliveTime," +
"createTime," +
"updateTime," +
+ "charset," +
+ "subscribeCycleForCatalog," +
+ "subscribeCycleForMobilePosition," +
+ "mobilePositionSubmissionInterval," +
+ "subscribeCycleForAlarm," +
+ "ssrcCheck," +
"online" +
") VALUES (" +
"#{deviceId}," +
@@ -47,15 +53,21 @@
"#{expires}," +
"#{registerTime}," +
"#{keepaliveTime}," +
- "datetime('now','localtime')," +
- "datetime('now','localtime')," +
+ "#{createTime}," +
+ "#{updateTime}," +
+ "#{charset}," +
+ "#{subscribeCycleForCatalog}," +
+ "#{subscribeCycleForMobilePosition}," +
+ "#{mobilePositionSubmissionInterval}," +
+ "#{subscribeCycleForAlarm}," +
+ "#{ssrcCheck}," +
"#{online}" +
")")
int add(Device device);
@Update(value = {" <script>" +
"UPDATE device " +
- "SET updateTime=datetime('now','localtime')" +
+ "SET updateTime='${updateTime}'" +
"<if test=\"name != null\">, name='${name}'</if>" +
"<if test=\"manufacturer != null\">, manufacturer='${manufacturer}'</if>" +
"<if test=\"model != null\">, model='${model}'</if>" +
@@ -69,6 +81,12 @@
"<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>" +
"WHERE deviceId='${deviceId}'"+
" </script>"})
int update(Device device);
--
Gitblit v1.8.0