From faff19e00620bc3e642a1a4361d2406ed752c181 Mon Sep 17 00:00:00 2001
From: fengyarnom <fengyarnom@gmail.com>
Date: Fri, 21 Feb 2025 11:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A3=80=E6=9F=A5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=20SIM=20=E5=8D=A1=20ICCID=20=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sideslope/executor/D3F0SelfCheckMessageExecutor.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
index 4620aa46..ed005755 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F0SelfCheckMessageExecutor.java
@@ -44,6 +44,8 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
     @Autowired
     private DataPersistService dataPersistService;
     @Autowired
+    private GnssDeviceMapper gnssDeviceMapper;
+    @Autowired
     GnssMsgMapper msgMapper;
 
     @Autowired
@@ -186,7 +188,14 @@ public class D3F0SelfCheckMessageExecutor implements Executor<D3F0SelfCheckMessa
 
     void checkAndAskICCID(Device device){
         // 如果设备的 ICCID 存在，那么就不用发送 "AT+ICCID" 指令
+
         if(device.getIccid() != null && !device.getIccid().trim().isEmpty()){
+            GnssDevice gnssDevice = gnssDeviceMapper.queryByDeviceId(device.getDeviceId());
+            if(gnssDevice.getIccid() != null && !gnssDevice.getIccid().trim().isEmpty()){
+                // 状态和流量查询更新需要 1-2 小时，期间 DataPersistService 更新可能不及时
+                // 若是数据库的设备已经更新了 iccid 号，将它同步到 DataPersistService 缓存中
+                device.setIccid(gnssDevice.getIccid());
+            }
             return;
         }
         String sendCmd = "AT+ICCID";