From 1448146b2a5e7f627761084e670fd6b828df2716 Mon Sep 17 00:00:00 2001
From: bgy <bgy@topsail.com>
Date: Fri, 23 Oct 2026 16:17:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7fastjson=E8=87=B32.0.57?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D<=3D1.2.83=E4=BB=BB=E6=84=8F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=89=A7=E8=A1=8C=E6=BC=8F=E6=B4=9E=EF=BC=8C=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=A6=BB=E7=BA=BF=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E9=98=88=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Code <noreply@anthropic.com>
---
 pom.xml                                                               | 4 +++-
 .../java/com/topsail/scheduletask/task/CheckRabbitMqScheduleTask.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a520a36..aa1b37b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,10 +70,12 @@
             <version>${hutool.version}</version>
         </dependency>
 
+        <!-- fastjson 2.x 兼容包：保留 com.alibaba.fastjson 包名，底层为 fastjson2，
+             默认关闭 autoType，修复 fastjson <= 1.2.83 任意代码执行漏洞 -->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
-            <version>1.2.83</version>
+            <version>2.0.57</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/com/topsail/scheduletask/task/CheckRabbitMqScheduleTask.java b/src/main/java/com/topsail/scheduletask/task/CheckRabbitMqScheduleTask.java
index 7a0fd6c..5328976 100644
--- a/src/main/java/com/topsail/scheduletask/task/CheckRabbitMqScheduleTask.java
+++ b/src/main/java/com/topsail/scheduletask/task/CheckRabbitMqScheduleTask.java
@@ -126,7 +126,7 @@ public class CheckRabbitMqScheduleTask {
                     }
                     //2.查询设备离线数量
                     List<DeviceOnlineInfo> offlineDevices = topsailTransmitLogDao.getOfflineDevice(imeiList, focusDeviceOnline.getProjectId());
-                    if (offlineDevices != null && offlineDevices.size() > 0) {
+                    if (offlineDevices != null && offlineDevices.size() > 2) {
                         //将离线的设备号码转成json字符串
                         Map<String, String> offlineDeviceMap = offlineDevices.stream()
                                 .collect(Collectors.toMap(DeviceOnlineInfo::getImei, DeviceOnlineInfo::getOfflineTime));