新增内部查询方法，替换simulation中scada设备查询方法

simulation.py

@@ -774,8 +774,8 @@ def run_simulation(
     if globals.reservoirs_id:
         # reservoirs_id = {'ZBBDJSCP000002': '2497', 'R00003': '2571'}
         # 1.获取reservoir的SCADA数据,形式如{'2497': '3.1231', '2571': '2.7387'}
-        reservoir_SCADA_data_dict = influxdb_api.query_SCADA_data_by_device_ID_and_time(
-            query_ids_list=list(globals.reservoirs_id.values()),
+        reservoir_SCADA_data_dict = TimescaleInternalStorage.query_scada_by_ids_time(
+            device_ids=list(globals.reservoirs_id.values()),
             query_time=modify_pattern_start_time,
         )
         # 2.构建出新字典，形式如{'ZBBDJSCP000002': '3.1231', 'R00003': '2.7387'}
@@ -798,8 +798,8 @@ def run_simulation(
                 set_pattern(name_c, cs)
     if globals.tanks_id:
         # 修改tank初始液位
-        tank_SCADA_data_dict = influxdb_api.query_SCADA_data_by_device_ID_and_time(
-            query_ids_list=list(globals.tanks_id.values()),
+        tank_SCADA_data_dict = TimescaleInternalStorage.query_scada_by_ids_time(
+            device_ids=list(globals.tanks_id.values()),
             query_time=modify_pattern_start_time,
         )
         tank_dict = {
@@ -814,11 +814,9 @@ def run_simulation(
                 set_tank(name_c, cs)
     if globals.fixed_pumps_id:
         # 修改工频泵的pattern
-        fixed_pump_SCADA_data_dict = (
-            influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                query_ids_list=list(globals.fixed_pumps_id.values()),
-                query_time=modify_pattern_start_time,
-            )
+        fixed_pump_SCADA_data_dict = TimescaleInternalStorage.query_scada_by_ids_time(
+            device_ids=list(globals.fixed_pumps_id.values()),
+            query_time=modify_pattern_start_time,
         )
         # print(fixed_pump_SCADA_data_dict)
         fixed_pump_dict = {
@@ -840,8 +838,8 @@ def run_simulation(
     if globals.variable_pumps_id:
         # 修改变频泵的pattern
         variable_pump_SCADA_data_dict = (
-            influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                query_ids_list=list(globals.variable_pumps_id.values()),
+            TimescaleInternalStorage.query_scada_by_ids_time(
+                device_ids=list(globals.variable_pumps_id.values()),
                 query_time=modify_pattern_start_time,
             )
         )
@@ -860,8 +858,8 @@ def run_simulation(
                 set_pattern(name_c, cs)
     if globals.demand_id:
         # 基于实时数据，修改大用户节点的pattern
-        demand_SCADA_data_dict = influxdb_api.query_SCADA_data_by_device_ID_and_time(
-            query_ids_list=list(globals.demand_id.values()),
+        demand_SCADA_data_dict = TimescaleInternalStorage.query_scada_by_ids_time(
+            device_ids=list(globals.demand_id.values()),
             query_time=modify_pattern_start_time,
         )
         demand_dict = {
@@ -887,8 +885,8 @@ def run_simulation(
     if globals.source_outflow_pattern_id:
         # 基于实时的出厂流量计数据，修改出厂流量计绑定的pattern
         source_outflow_SCADA_data_dict = (
-            influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                query_ids_list=list(globals.source_outflow_pattern_id.values()),
+            TimescaleInternalStorage.query_scada_by_ids_time(
+                device_ids=list(globals.source_outflow_pattern_id.values()),
                 query_time=modify_pattern_start_time,
             )
         )
@@ -925,8 +923,8 @@ def run_simulation(
     if globals.realtime_pipe_flow_pattern_id:
         # 基于实时的pipe_flow类数据，修改pipe_flow类绑定的pattern
         realtime_pipe_flow_SCADA_data_dict = (
-            influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                query_ids_list=list(globals.realtime_pipe_flow_pattern_id.values()),
+            TimescaleInternalStorage.query_scada_by_ids_time(
+                device_ids=list(globals.realtime_pipe_flow_pattern_id.values()),
                 query_time=modify_pattern_start_time,
             )
         )
@@ -962,8 +960,8 @@ def run_simulation(
             query_api_id = globals.realtime_pipe_flow_pattern_id.get(pipe_flow_region)
             temp_realtime_pipe_flow_pattern_id[pipe_flow_region] = query_api_id
         temp_realtime_pipe_flow_SCADA_data_dict = (
-            influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                query_ids_list=list(temp_realtime_pipe_flow_pattern_id.values()),
+            TimescaleInternalStorage.query_scada_by_ids_time(
+                device_ids=list(temp_realtime_pipe_flow_pattern_id.values()),
                 query_time=modify_pattern_start_time,
             )
         )
@@ -1020,14 +1018,14 @@ def run_simulation(
                 globals.non_realtime_region_patterns.get(region, [])
             )
             region_source_outflow_data_dict = (
-                influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                    query_ids_list=temp_source_outflow_region_id,
+                TimescaleInternalStorage.query_scada_by_ids_time(
+                    device_ids=temp_source_outflow_region_id,
                     query_time=modify_pattern_start_time,
                 )
             )
             region_realtime_region_pipe_flow_and_demand_data_dict = (
-                influxdb_api.query_SCADA_data_by_device_ID_and_time(
-                    query_ids_list=temp_realtime_region_pipe_flow_and_demand_id,
+                TimescaleInternalStorage.query_scada_by_ids_time(
+                    device_ids=temp_realtime_region_pipe_flow_and_demand_id,
                     query_time=modify_pattern_start_time,
                 )
             )