OrgTJWater/TJWaterServerBinary
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正 SCADA 数据导入时的空数据问题；修正时区错位问题

Browse Source
This commit is contained in:
JIANG
2025-11-26 10:47:16 +08:00
parent 5ab10886a0
commit 15ffca9605
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
influxdb_api.py
View File

@@ -4664,9 +4664,10 @@ def import_multicolumn_data_from_file(
) )
def convert_to_iso(timestr): 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") 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: with open(file_path, encoding="utf-8") as f:
reader = csv.reader(f) reader = csv.reader(f)
@@ -4680,9 +4681,11 @@ def import_multicolumn_data_from_file(
try: try:
raw_value = float(value) raw_value = float(value)
except (ValueError, TypeError): except (ValueError, TypeError):
raw_value = 0.0 raw_value = None
scada_id = device_ids[idx] scada_id = device_ids[idx]
# 如果是原始数据，直接使用Value列 # 如果是原始数据，直接使用Value列
if(raw_value is None or raw_value == ''):
continue
point = ( point = (
Point("SCADA") Point("SCADA")
.tag("date", iso_time.split("T")[0]) .tag("date", iso_time.split("T")[0])