From f098aa42ae49c7af964d71f042b9a3ea7720a1ff Mon Sep 17 00:00:00 2001
From: DingZQ <zqding@hotmail.com>
Date: Sat, 8 Mar 2025 10:35:20 +0800
Subject: [PATCH] Fixed time error

---
 .gitignore      |  3 ++-
 influxdb_api.py |  6 ++++--
 setup_server.md | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f74ed1d..7ed0f87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ TODO.md
 # build pyd
 build
 *.c
-*.pyd
\ No newline at end of file
+*.pyd
+temp/
diff --git a/influxdb_api.py b/influxdb_api.py
index 83736c7..c676690 100644
--- a/influxdb_api.py
+++ b/influxdb_api.py
@@ -1354,8 +1354,10 @@ def query_SCADA_data_by_device_ID_and_time_range(query_ids_list: List[str], star
     query_api = client.query_api()
     # 将北京时间转换为 UTC 时间
     
-    utc_start_time = time_api.parse_utc_time(start_time)
-    utc_end_time = time_api.parse_utc_time(end_time)
+    bg_start_time = time_api.parse_beijing_time(start_time)
+    utc_start_time = bg_start_time.astimezone(timezone.utc)
+    bg_end_time = time_api.parse_beijing_time(end_time)
+    utc_end_time = bg_end_time.astimezone(timezone.utc)
 
     # 构建查询字典
     SCADA_results = []
diff --git a/setup_server.md b/setup_server.md
index da22d41..048b70f 100644
--- a/setup_server.md
+++ b/setup_server.md
@@ -50,3 +50,20 @@ influx config create --config-name onboarding `
   --org "TJWATERORG" `
   --token "cpuAmRnJqSMd7F34q1VjG6JgwZfO0S0w0vK2ZmAvA6zvf6m-6UAobUKSW3xhGr_nxZI5HsFlpfZHT1i8sI3LyQ==" `
   --active
+
+
+Setup instructions for WMH's work
+
+1. import scada_info.csv
+    run python online_Analysis.py
+
+2. import history_pattern_flow.csv
+    run python online_Analysis.py
+    Should manually change code
+
+3. run create_template.py
+
+4. run influxdb_api.py  
+    在InfluxDB数据库中创建好我们需要的bucket
+    create buckets
+