From 1753133e4ff5d2f2d477783be08e6cd82a1a5313 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: Sat, 7 Jun 2025 22:02:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=80=81=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=8D=AB=E6=98=9F=E4=BF=A1=E5=8F=B7=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=B2=A1=E6=9C=89=E5=AE=9A=E4=BD=8D=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/bst/device/utils/DeviceUtil.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/utils/DeviceUtil.java b/ruoyi-service/src/main/java/com/ruoyi/bst/device/utils/DeviceUtil.java
index 4147ce4..61beda9 100644
--- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/utils/DeviceUtil.java
+++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/utils/DeviceUtil.java
@@ -87,7 +87,7 @@ public class DeviceUtil {
         if (device == null || info == null) {
             return;
         }
-        
+
         // 设置设备信息
         if (info.containsKey(DeviceCacheKey.VOLTAGE)) {
             device.setVoltage(JsonUtils.getBigDecimal(info.get(DeviceCacheKey.VOLTAGE)));
@@ -186,11 +186,13 @@ public class DeviceUtil {
 
     /**
      * 卫星信号弱
+     * 仅卫星信号不为空才判断，若为空，则不判断是否弱信号
+     * 因为老模块没有卫星信号
      * @param s
      * @return
      */
     public static boolean isLowSatelliteSignal(Integer s) {
-        return s == null || s <= 5;
+        return s != null && s <= 5;
     }
 
     /**
@@ -212,7 +214,7 @@ public class DeviceUtil {
      * @return
      */
     public static boolean validMobileLocation(BigDecimal lon, BigDecimal lat) {
-        return lon != null && lat != null 
+        return lon != null && lat != null
             && !MathUtils.equals(lon, BigDecimal.ZERO) && !MathUtils.equals(lat, BigDecimal.ZERO)
             && lon.scale() >= 6 && lat.scale() >= 6;
     }