From bc68004c6e7eb23da6cf8afdd45a56c40d1c492b Mon Sep 17 00:00:00 2001
From: TongTongStudio <tongtongstudios@gmail.com>
Date: Mon, 10 Aug 2026 01:59:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(device):=20=E5=90=8C=E6=AD=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=9E=8B=E5=8F=B7=E5=92=8C=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在上报系统信息时同步更新设备型号，在上报其他信息时同步更新推送ID，确保设备表信息保持最新。
---
 .../device/controller/MobileController.java   | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/main/java/com/youlai/boot/device/controller/MobileController.java b/src/main/java/com/youlai/boot/device/controller/MobileController.java
index 611fb6fb..fcd57b72 100644
--- a/src/main/java/com/youlai/boot/device/controller/MobileController.java
+++ b/src/main/java/com/youlai/boot/device/controller/MobileController.java
@@ -13,6 +13,7 @@ import com.youlai.boot.device.model.entity.SnDeviceHardwareInfo;
 import com.youlai.boot.device.model.entity.SnDeviceNetworkInfo;
 import com.youlai.boot.device.model.entity.SnDeviceSecurityInfo;
 import com.youlai.boot.device.model.entity.SnDeviceOtherInfo;
+import com.youlai.boot.device.model.entity.SnDeviceInfo;
 import com.youlai.boot.device.model.req.ApkInstallInfoReq;
 import com.youlai.boot.device.model.req.SnSystemInfoReq;
 import com.youlai.boot.device.model.req.SnHardwareInfoReq;
@@ -105,6 +106,17 @@ public class MobileController {
                 return Result.failed("硬件信息不能为空");
             }
 
+            if (snSystemInfoReq.getDeviceModel() != null && !snSystemInfoReq.getDeviceModel().trim().isEmpty()) {
+                SnDeviceInfo deviceInfo = deviceService.lambdaQuery()
+                        .eq(SnDeviceInfo::getSerialno, sn)
+                        .one();
+                if (deviceInfo != null) {
+                    deviceInfo.setSnModel(snSystemInfoReq.getDeviceModel());
+                    deviceInfo.setUpdateTime(LocalDateTime.now());
+                    deviceService.updateById(deviceInfo);
+                }
+            }
+
             SnDeviceSystemInfo systemInfo = new SnDeviceSystemInfo();
             BeanUtils.copyProperties(snSystemInfoReq, systemInfo);
             systemInfo.setSerialno(sn);
@@ -174,6 +186,18 @@ public class MobileController {
                 return Result.failed("保存其他信息失败");
             }
 
+            // 如果推送ID不为空，则同步更新设备表的推送ID
+            if (snOtherInfoReq.getPushId() != null && !snOtherInfoReq.getPushId().trim().isEmpty()) {
+                SnDeviceInfo deviceInfo = deviceService.lambdaQuery()
+                        .eq(SnDeviceInfo::getSerialno, sn)
+                        .one();
+                if (deviceInfo != null) {
+                    deviceInfo.setPushId(snOtherInfoReq.getPushId());
+                    deviceInfo.setUpdateTime(LocalDateTime.now());
+                    deviceService.updateById(deviceInfo);
+                }
+            }
+
             logger.info("其他信息上传成功, sn: {}", sn);
             return Result.success();