From 1bcfa514b8fa5944b1981bb19ed760f83ecc9108 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Fri, 10 Jul 2026 15:00:23 +0800
Subject: [PATCH] =?UTF-8?q?f10=E7=9A=84320=E5=AD=97=E8=8A=82=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E9=80=82=E9=85=8D,,=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E7=B4=A2=E5=BC=95=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/techsor/datacenter/sender/dao/F10Dao.java  | 5 +++--
 .../techsor/datacenter/sender/entitiy/f10/F10JournalLog.java | 3 +++
 .../com/techsor/datacenter/sender/service/F10Service.java    | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/techsor/datacenter/sender/dao/F10Dao.java b/src/main/java/com/techsor/datacenter/sender/dao/F10Dao.java
index 3240d47..46d35e1 100644
--- a/src/main/java/com/techsor/datacenter/sender/dao/F10Dao.java
+++ b/src/main/java/com/techsor/datacenter/sender/dao/F10Dao.java
@@ -23,8 +23,8 @@ public class F10Dao {
                 "customer_name, phone, remark, display_color, error_reason, line_type, area_name, " +
                 "send_date, send_time, customer_no, display_data1, display_data2, " +
                 "instruction_flag, signal_code, card_no, card_type, mansion_building, mansion_room, option_field, " +
-                "created_at, created_time, receive_timestamp, expired_flag, alert_history_id" +
-                ") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+                "created_at, created_time, receive_timestamp, send_timestamp, expired_flag, alert_history_id" +
+                ") VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 
         jdbcTemplate.update(sql,
                 f10JournalLog.getDeviceId(),
@@ -78,6 +78,7 @@ public class F10Dao {
                 f10JournalLog.getCreatedAt(),
                 new java.sql.Timestamp(f10JournalLog.getCreatedAt()),
                 f10JournalLog.getReceiveTimestamp(),
+                f10JournalLog.getSendTimestamp(),
                 f10JournalLog.getExpiredFlag(),
                 f10JournalLog.getAlertHistoryId()
         );
diff --git a/src/main/java/com/techsor/datacenter/sender/entitiy/f10/F10JournalLog.java b/src/main/java/com/techsor/datacenter/sender/entitiy/f10/F10JournalLog.java
index 9a059fc..0e9af3c 100644
--- a/src/main/java/com/techsor/datacenter/sender/entitiy/f10/F10JournalLog.java
+++ b/src/main/java/com/techsor/datacenter/sender/entitiy/f10/F10JournalLog.java
@@ -80,6 +80,9 @@ public class F10JournalLog {
     // 接收时间戳（JST）
     private Long receiveTimestamp;
 
+    // 发送时间戳（JST）
+    private Long sendTimestamp;
+
     // 是否过期告警（0=正常，1=过期）
     private Integer expiredFlag;
 
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 1e4948d..9da84c0 100644
--- a/src/main/java/com/techsor/datacenter/sender/service/F10Service.java
+++ b/src/main/java/com/techsor/datacenter/sender/service/F10Service.java
@@ -154,6 +154,7 @@ public class F10Service {
             f10JournalLog.setReceiveTimestamp(receivedCurrentTs);
 
             long sendTs = parseToTimestamp(f10JournalLog.getSendDate(), f10JournalLog.getSendTime());
+            f10JournalLog.setSendTimestamp(sendTs);
 
             String redisKey = getLatestAlarmKey(f10JournalLog.getDeviceId());
             // 从 Redis 取值