From 419fbb1e07bf549657ce23bcffc01393aab3d76c Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Thu, 25 Dec 2025 23:39:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A1=E6=B5=8B=E8=AE=BE=E5=A4=87aurora?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=A1=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datacenter/sender/dao/DashboardStatisticsDao.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/com/techsor/datacenter/sender/dao/DashboardStatisticsDao.java b/src/main/java/com/techsor/datacenter/sender/dao/DashboardStatisticsDao.java
index c27dc11..e75372b 100644
--- a/src/main/java/com/techsor/datacenter/sender/dao/DashboardStatisticsDao.java
+++ b/src/main/java/com/techsor/datacenter/sender/dao/DashboardStatisticsDao.java
@@ -145,6 +145,12 @@ public class DashboardStatisticsDao {
 				.append("upload_value = VALUES(upload_value), ")
 				.append("min_value = VALUES(min_value), ")
 				.append("max_value = VALUES(max_value), ")
+				.append("date_year = VALUES(date_year), ")
+				.append("date_month = VALUES(date_month), ")
+				.append("date_day = VALUES(date_day), ")
+				.append("date_hour = VALUES(date_hour), ")
+				.append("date_minute = VALUES(date_minute), ")
+				.append("date_second = VALUES(date_second), ")
 				.append("upload_at = VALUES(upload_at)");
 		auroraJdbcTemplate.update(upsertSql.toString(), upsertParams.toArray());
 	}

From adbc30d80f790ca820c8c5e88d245d272c931f18 Mon Sep 17 00:00:00 2001
From: "review512jwy@163.com" <“review512jwy@163.com”>
Date: Fri, 26 Dec 2025 22:24:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=91=8A=E8=AD=A6=E6=97=B6=E4=BF=9D=E7=95=99=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datacenter/sender/dao/DashboardAlertDao.java       | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/techsor/datacenter/sender/dao/DashboardAlertDao.java b/src/main/java/com/techsor/datacenter/sender/dao/DashboardAlertDao.java
index 5b72a8e..f385adb 100644
--- a/src/main/java/com/techsor/datacenter/sender/dao/DashboardAlertDao.java
+++ b/src/main/java/com/techsor/datacenter/sender/dao/DashboardAlertDao.java
@@ -83,7 +83,7 @@ public class DashboardAlertDao {
 				// 批量执行 upsert
 				StringBuilder sql = new StringBuilder(
 						"INSERT INTO device_rawdata_realtime (" +
-								"device_id, building_id, status, receive_ts, " +
+								"device_id, building_id, status, dashboard_status, receive_ts, " +
 								"alert_title, alert_content, alert_cancel_title, alert_cancel_content, " +
 								"raw_data, upload_year, upload_month, upload_day) VALUES "
 				);
@@ -91,7 +91,7 @@ public class DashboardAlertDao {
 				for (int i = 0; i < subList.size(); i++) {
 					DynamodbEntity entity = subList.get(i).getEntity();
 
-					sql.append("(?,?,?,?,?,?,?,?,?,?,?,?)");
+					sql.append("(?,?,?,?,?,?,?,?,?,?,?,?,?)");
 					if (i < subList.size() - 1) {
 						sql.append(",");
 					}
@@ -99,6 +99,7 @@ public class DashboardAlertDao {
 					params.add(entity.getDeviceId());
 					params.add(entity.getDbBuildingId());
 					params.add(entity.getStatus());
+					params.add(entity.getStatus());
 					params.add(entity.getReceive_ts());
 					params.add(entity.getAlertTitle());
 					params.add(entity.getAlertContent());
@@ -108,6 +109,8 @@ public class DashboardAlertDao {
 					params.add(Integer.parseInt(entity.getYearKey()));
 					params.add(Integer.parseInt(entity.getMonthKey()));
 					params.add(Integer.parseInt(entity.getDayKey()));
+					//给下面dashboard_status = IF(? = 1 里的?用
+					params.add(entity.getRetainAlert());
 				}
 				sql.append(" ON DUPLICATE KEY UPDATE ")
 						.append("building_id = VALUES(building_id), ")
@@ -120,7 +123,8 @@ public class DashboardAlertDao {
 						.append("raw_data = VALUES(raw_data), ")
 						.append("upload_year = VALUES(upload_year), ")
 						.append("upload_month = VALUES(upload_month), ")
-						.append("upload_day = VALUES(upload_day)");
+						.append("upload_day = VALUES(upload_day), ")
+						.append("dashboard_status = IF(? = 1 AND VALUES(status) = 'alert_cancel' AND dashboard_status = 'alert', dashboard_status, VALUES(status))");
 				jdbcTemplate.update(sql.toString(), params.toArray());
 
 			} finally {