From 224e9043060d9831cd08445ea8d91411e959ac34 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 08 一月 2021 14:46:55 +0800
Subject: [PATCH] 修复更新设备和通道信息时检测字段是否存在

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 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 3c10618..b49d0dc 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
@@ -44,18 +44,21 @@
     int add(Device device);
 
 
-    @Update("UPDATE device " +
-            "SET name=#{name}, " +
-            "manufacturer=#{manufacturer}," +
-            "model=#{model}," +
-            "firmware=#{firmware}, " +
-            "transport=#{transport}," +
-            "streamMode=#{streamMode}, " +
-            "ip=#{ip}, " +
-            "port=#{port}, " +
-            "hostAddress=#{hostAddress}, " +
-            "online=#{online} " +
-            "WHERE deviceId=#{deviceId}")
+    @Update(value = {" <script>" +
+                "UPDATE device " +
+                "SET deviceId='${deviceId}'" +
+                "<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=\"streamMode != null\">, streamMode='${streamMode}'</if>" +
+                "<if test=\"ip != null\">, ip='${ip}'</if>" +
+                "<if test=\"port != null\">, port=${port}</if>" +
+                "<if test=\"hostAddress != null\">, hostAddress='${hostAddress}'</if>" +
+                "<if test=\"online != null\">, online=${online}</if>" +
+                "WHERE deviceId='${deviceId}'"+
+            " </script>"})
     int update(Device device);
 
     @Select("SELECT *, (SELECT count(0) FROM device_channel WHERE deviceId=de.deviceId) as channelCount  FROM device de")

--
Gitblit v1.8.0