Imdroid/go_rain_dtu
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修改了聚合查询

Browse Source
This commit is contained in:
fengyarnom 2025-05-15 17:27:47 +08:00
parent 09c9a078c4
commit 785a02bf8a
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/dao/sensor.go
View File

@ -64,12 +64,7 @@ func (dao *SensorDAO) GetAggregatedData(start, end time.Time, interval string) (
// 构建通用查询 // 构建通用查询
query := ` query := `
SELECT SELECT
DATE_FORMAT( MIN(timestamp) as ts,
FROM_UNIXTIME(
FLOOR(UNIX_TIMESTAMP(timestamp)/?)*?
),
?
) as ts,
ROUND(AVG(temperature)/10, 1) as avg_temp, ROUND(AVG(temperature)/10, 1) as avg_temp,
MAX(rainfall) - MIN(rainfall) as rainfall, MAX(rainfall) - MIN(rainfall) as rainfall,
ROUND(AVG(humidity)/10, 1) as avg_humidity, 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( rows, err := dao.db.Query(
query, query,
intervalSeconds, intervalSeconds, // 用于FROM_UNIXTIME参数
timeFormat, // DATE_FORMAT格式
start, end, // 时间范围 start, end, // 时间范围
intervalSeconds, // GROUP BY参数 intervalSeconds, // GROUP BY参数
) )