From 4f63af82147733d2881320e37cfbf0f6a3291131 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 29 Apr 2025 18:08:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/bst/device/mapper/DeviceMapper.java    |  8 ++++++++
 .../com/ruoyi/bst/device/mapper/DeviceMapper.xml     | 12 ++++++++++++
 .../device/service/impl/DeviceIotServiceImpl.java    |  6 +++---
 .../com/ruoyi/web/app/AppLocationLogController.java  | 12 ++++++++++++
 4 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 ruoyi-web/src/main/java/com/ruoyi/web/app/AppLocationLogController.java

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.java
index a508095..70fe2de 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.java
@@ -160,4 +160,12 @@ public interface DeviceMapper
      */
     List<DeviceMacSnVO> selectMacSnList(@Param("query") DeviceQuery query);
 
+    /**
+     * 条件更新（简单版）
+     * @param data
+     * @param query
+     * @return
+     */
+    int updateByQuerySimple(@Param("data") Device data, @Param("query") DeviceQuery query);
+
 }
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
index f9f9dc9..d94eb72 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/mapper/DeviceMapper.xml
@@ -476,4 +476,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <!-- updateByQuerySimple --> 
+
+    <update id="updateByQuerySimple">
+        update bst_device bd
+        <trim prefix="SET" suffixOverrides=",">
+            <include refid="updateColumns"/>
+        </trim>
+        <where>
+            <include refid="searchCondition"/>
+        </where>
+    </update>
+
 </mapper>
diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java
index 882e948..7941c7a 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java
@@ -300,7 +300,7 @@ public class DeviceIotServiceImpl implements DeviceIotService {
         if (device == null) {
             return 0;
         }
-        if (StringUtils.isBlank(device.getMac()) || device.getId() == null) {
+        if (StringUtils.isBlank(device.getMac()) && device.getId() == null) {
             return 0;
         }
         Device data = new Device();
@@ -319,8 +319,8 @@ public class DeviceIotServiceImpl implements DeviceIotService {
         data.setSoftwareVersion(device.getSoftwareVersion());
         DeviceQuery query = new DeviceQuery();
         query.setId(device.getId());
-        query.setMac(device.getMac());
-        return deviceMapper.updateByQuery(data, query);
+        query.setEqMac(device.getMac());
+        return deviceMapper.updateByQuerySimple(data, query);
     }
 
     @Override
diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/app/AppLocationLogController.java b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppLocationLogController.java
new file mode 100644
index 0000000..68bfab0
--- /dev/null
+++ b/ruoyi-web/src/main/java/com/ruoyi/web/app/AppLocationLogController.java
@@ -0,0 +1,12 @@
+package com.ruoyi.web.app;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ruoyi.common.core.controller.BaseController;
+
+@RestController
+@RequestMapping("/app/locationLog")
+public class AppLocationLogController extends BaseController {
+    
+}