新增清洗 scada 数据方法，更新数据返回格式

timescaledb/schemas/scada.py

@@ -1,5 +1,6 @@
 from typing import List, Any
 from datetime import datetime
+from collections import defaultdict
 from psycopg import AsyncConnection, Connection, sql
 
 
@@ -59,19 +60,25 @@ class ScadaRepository:
         start_time: datetime,
         end_time: datetime,
         field: str,
-    ) -> List[dict]:
+    ) -> dict:
         valid_fields = {"monitored_value", "cleaned_value"}
         if field not in valid_fields:
             raise ValueError(f"Invalid field: {field}")
 
         query = sql.SQL(
-            "SELECT device_id, {} FROM scada.scada_data WHERE time >= %s AND time <= %s AND device_id = ANY(%s)"
+            "SELECT device_id, time, {} FROM scada.scada_data WHERE time >= %s AND time <= %s AND device_id = ANY(%s)"
         ).format(sql.Identifier(field))
 
         async with conn.cursor() as cur:
             await cur.execute(query, (start_time, end_time, device_ids))
             rows = await cur.fetchall()
-            return [{"device_id": row["device_id"], field: row[field]} for row in rows]
+            result = defaultdict(list)
+            for row in rows:
+                result[row["device_id"]].append({
+                    "time": row["time"].isoformat(),
+                    "value": row[field]
+                })
+            return dict(result)
 
     @staticmethod
     async def update_scada_field(