From be9a2e9337102066d013d3c9dbe04077c101be9e Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Thu, 9 Jul 2026 20:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E6=88=90=E6=A0=B9=E6=8D=AE=20?=
 =?UTF-8?q?=E9=80=81=E4=BF=A1=E6=97=B6=E9=97=B4=E5=8E=BB=E5=88=A4=E5=AE=9A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9C=89=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../techsor/datacenter/sender/service/F10Service.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/techsor/datacenter/sender/service/F10Service.java b/src/main/java/com/techsor/datacenter/sender/service/F10Service.java
index 47e6f90..1e4948d 100644
--- a/src/main/java/com/techsor/datacenter/sender/service/F10Service.java
+++ b/src/main/java/com/techsor/datacenter/sender/service/F10Service.java
@@ -153,6 +153,8 @@ public class F10Service {
             long receivedCurrentTs = parseToTimestamp(f10JournalLog.getReceiveDate(), f10JournalLog.getReceiveTime());
             f10JournalLog.setReceiveTimestamp(receivedCurrentTs);
 
+            long sendTs = parseToTimestamp(f10JournalLog.getSendDate(), f10JournalLog.getSendTime());
+
             String redisKey = getLatestAlarmKey(f10JournalLog.getDeviceId());
             // 从 Redis 取值
             String latestTsStr = redisUtils.get(redisKey);
@@ -169,12 +171,12 @@ public class F10Service {
             // ===== 判断逻辑 =====
             if (latestTs == null) {
                 // 首次
-                redisUtils.add(redisKey, String.valueOf(receivedCurrentTs));
+                redisUtils.add(redisKey, String.valueOf(sendTs));
             } else {
-                if (receivedCurrentTs > latestTs) {
+                if (sendTs > latestTs) {
                     // 新数据
-                    redisUtils.add(redisKey, String.valueOf(receivedCurrentTs));
-                } else if (receivedCurrentTs == latestTs) {
+                    redisUtils.add(redisKey, String.valueOf(sendTs));
+                } else if (sendTs == latestTs) {
                     // 重复数据 → 直接丢弃
                     log.warn("[F10] 重复告警, 丢弃 deviceId={}", f10JournalLog.getDeviceId());
                     return;