From 785a02bf8ad3541867bce99d45246ec9c860bd35 Mon Sep 17 00:00:00 2001
From: fengyarnom <fengyarnom@gmail.com>
Date: Thu, 15 May 2025 17:27:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E8=81=9A=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/dao/sensor.go | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/internal/dao/sensor.go b/internal/dao/sensor.go
index b5067c5..77a299f 100644
--- a/internal/dao/sensor.go
+++ b/internal/dao/sensor.go
@@ -64,12 +64,7 @@ func (dao *SensorDAO) GetAggregatedData(start, end time.Time, interval string) (
 	// 构建通用查询
 	query := `
 		SELECT 
-			DATE_FORMAT(
-				FROM_UNIXTIME(
-					FLOOR(UNIX_TIMESTAMP(timestamp)/?)*?
-				),
-				?
-			) as ts,
+			MIN(timestamp) as ts,
 			ROUND(AVG(temperature)/10, 1) as avg_temp,
 			MAX(rainfall) - MIN(rainfall) as rainfall,
 			ROUND(AVG(humidity)/10, 1) as avg_humidity,
@@ -83,8 +78,6 @@ func (dao *SensorDAO) GetAggregatedData(start, end time.Time, interval string) (
 	// 执行查询
 	rows, err := dao.db.Query(
 		query,
-		intervalSeconds, intervalSeconds, // 用于FROM_UNIXTIME参数
-		timeFormat, // DATE_FORMAT格式
 		start, end, // 时间范围
 		intervalSeconds, // GROUP BY参数
 	)