From 15ffca9605621ed7530bc1ebf375d1ba892809f9 Mon Sep 17 00:00:00 2001
From: JIANG <huarch97@gmail.com>
Date: Wed, 26 Nov 2025 10:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20SCADA=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=97=B6=E7=9A=84=E7=A9=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E6=AD=A3=E6=97=B6=E5=8C=BA?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 influxdb_api.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/influxdb_api.py b/influxdb_api.py
index b964f60..39d120d 100644
--- a/influxdb_api.py
+++ b/influxdb_api.py
@@ -4664,9 +4664,10 @@ def import_multicolumn_data_from_file(
         )
 
     def convert_to_iso(timestr):
-        # 假设原格式为 '2025-08-03 00:00:00'
+        # 假设原格式为 '2025-08-03 00:00:00'，将其解析为北京时间 (+08:00)
         dt = datetime.strptime(timestr, "%Y-%m-%d %H:%M:%S")
-        return dt.isoformat()
+        dt_beijing = pytz.timezone('Asia/Shanghai').localize(dt)
+        return dt_beijing.isoformat()
 
     with open(file_path, encoding="utf-8") as f:
         reader = csv.reader(f)
@@ -4680,9 +4681,11 @@ def import_multicolumn_data_from_file(
                     try:
                         raw_value = float(value)
                     except (ValueError, TypeError):
-                        raw_value = 0.0
+                        raw_value = None
                     scada_id = device_ids[idx]
                     # 如果是原始数据，直接使用Value列
+                    if(raw_value is None or raw_value == ''):
+                        continue
                     point = (
                         Point("SCADA")
                         .tag("date", iso_time.split("T")[0])