From b1059f807f7e3cd0500079ba6492f09a79b6a82d 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, 13 May 2025 11:57:03 +0800
Subject: [PATCH] =?UTF-8?q?debug=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/service/impl/IotReceiveServiceImpl.java      | 12 ++++++++++++
 ruoyi-web/pom.xml                                    | 10 +++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
index d00b934..bfcc1c6 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/iot/service/impl/IotReceiveServiceImpl.java
@@ -15,6 +15,7 @@ import com.ruoyi.bst.area.service.AreaService;
 import com.ruoyi.bst.area.utils.AreaUtil;
 import com.ruoyi.bst.areaSub.domain.AreaSubVO;
 import com.ruoyi.bst.areaSub.service.AreaSubService;
+import com.ruoyi.bst.device.domain.Device;
 import com.ruoyi.bst.device.domain.DeviceVO;
 import com.ruoyi.bst.device.domain.enums.DeviceLockStatus;
 import com.ruoyi.bst.device.domain.enums.DeviceQuality;
@@ -76,6 +77,7 @@ public class IotReceiveServiceImpl implements IotReceiveService {
         }
         // 数据点推送
         if (ReceiveType.DATA_POINT.getType().equals(msg.getType())) {
+            // 设备数据
             if (IotConstants.DS_SYS.equals(msg.getDsId())) {
                 // 查询设备信息
                 DeviceVO device = deviceService.selectSimpleByMacForLocationLog(msg.getDevName());
@@ -117,6 +119,16 @@ public class IotReceiveServiceImpl implements IotReceiveService {
 
                 // 处理定位日志
                 this.handleLocationLog(device);
+            } 
+            // 软件版本
+            else if (IotConstants.DS_VER.equals(msg.getDsId())) {
+                Device data = new Device();
+                data.setVersion(msg.getValue().toString());
+                data.setMac(msg.getDevName());
+                int update = deviceIotService.updateIot(data);
+                if (update != 1) {
+                    log.error("更新设备软件版本失败: {}，版本：{}", msg.getDevName(), msg.getValue());
+                }
             }
         }
         // 生命周期（暂时不做，需要测试）
diff --git a/ruoyi-web/pom.xml b/ruoyi-web/pom.xml
index afaea5c..fd9538a 100644
--- a/ruoyi-web/pom.xml
+++ b/ruoyi-web/pom.xml
@@ -18,11 +18,11 @@
     <dependencies>
 
         <!-- spring-boot-devtools -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-devtools</artifactId>
-            <optional>true</optional> <!-- 表示依赖不会传递 -->
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-devtools</artifactId>-->
+<!--            <optional>true</optional> &lt;!&ndash; 表示依赖不会传递 &ndash;&gt;-->
+<!--        </dependency>-->
 
          <!-- Mysql驱动包 -->
         <dependency>