From f9be86382bcd71fd158662c8508146d585a78947 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sat, 3 Feb 2024 10:52:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8D=AB=E6=98=9F=E6=95=B0?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/D3F2StopIndicationMessageExecutor.java          | 5 +++--
 .../com/imdroid/sideslope/service/WarningServiceImpl.java    | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
index dd3cfd2c..c3e4bc45 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D3F2StopIndicationMessageExecutor.java
@@ -57,14 +57,15 @@ public class D3F2StopIndicationMessageExecutor implements Executor<D3F2StopIndic
             LocalDateTime uploadTime = multiLineGNSSCalcService.checkUploadTime(
                     device.getDeviceId(), device.getTenantId());
             dataPersistService.saveDeviceTrxStat(message, (uploadTime!=null), device.getSatelitesInUse());
-            device.setSatelitesInUse(0);
             // 通知beidou服务设备休眠
             beidouClient.onDeviceStop(deviceId,device.getTenantId());
             if(uploadTime!=null){
                 beidouClient.onGnssUpload(deviceId,device.getTenantId(),uploadTime);
             }
             // 检查告警
-            warningService.checkD3xxNum(device);
+            if(device.getDeviceType() == Device.DEVICE_BASE_STATION) {
+                warningService.checkD3xxNum(device);
+            }
         });
 
         return null;
diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
index c227a453..c3bfb67a 100644
--- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
+++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/WarningServiceImpl.java
@@ -58,6 +58,9 @@ public class WarningServiceImpl implements WarningService {
         }
 
         GnssStatus status = gnssStatusMapper.getByDeviceId(deviceId);
+        // 清除d331告警
+        status.setWarningcode(status.getWarningcode() & ~WarningCfg.TYPE_LESS_D3XX);
+
         if(0 == numB562Stat[0]){
             // 记录连续无固定解的轮数
             if(status != null){