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 取值