From 55ee6f5f0d363faacdb04e7ff01ef9f23e0b9d7f Mon Sep 17 00:00:00 2001
From: gaofw189 <gaofw189@chinatelecom.cn>
Date: 星期二, 07 二月 2023 09:26:08 +0800
Subject: [PATCH] 修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 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 b9a5817..8143d35 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}," +
@@ -104,21 +106,22 @@
@Update(value = {" <script>" +
"UPDATE device " +
- "SET updateTime='${updateTime}'" +
- "<if test=\"name != null\">, name='${name}'</if>" +
- "<if test=\"manufacturer != null\">, manufacturer='${manufacturer}'</if>" +
- "<if test=\"model != null\">, model='${model}'</if>" +
- "<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=\"expires != null\">, expires=${expires}</if>" +
- "WHERE deviceId='${deviceId}'"+
+ "SET updateTime=#{updateTime}" +
+ "<if test=\"name != null\">, name=#{name}</if>" +
+ "<if test=\"manufacturer != null\">, manufacturer=#{manufacturer}</if>" +
+ "<if test=\"model != null\">, model=#{model}</if>" +
+ "<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);
@@ -222,28 +225,28 @@
"geoCoordSys," +
"treeType," +
"online" +
- " FROM device WHERE ip = #{host} AND port=${port}")
+ " FROM device WHERE ip = #{host} AND port=#{port}")
Device getDeviceByHostAndPort(String host, int port);
@Update(value = {" <script>" +
"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=\"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>" +
+ "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=\"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}'"+
+ "WHERE deviceId=#{deviceId}"+
" </script>"})
int updateCustom(Device device);
--
Gitblit v1.8.0