统一scheme_name命名规则

scripts/main.py

@@ -3233,7 +3233,7 @@ async def fastapi_query_all_scheme_all_records(
         return loaded_dict
 
     results = influxdb_api.query_scheme_all_record(
-        scheme_Type=schemetype, scheme_Name=schemename, query_date=querydate
+        scheme_Type=schemetype, scheme_name=schemename, query_date=querydate
     )
     packed = msgpack.packb(results, default=encode_datetime)
     redis_client.set(cache_key, packed)
@@ -3257,7 +3257,7 @@ async def fastapi_query_all_scheme_all_records_property(
         all_results = msgpack.unpackb(data, object_hook=decode_datetime)
     else:
         all_results = influxdb_api.query_scheme_all_record(
-            scheme_Type=schemetype, scheme_Name=schemename, query_date=querydate
+            scheme_Type=schemetype, scheme_name=schemename, query_date=querydate
         )
         packed = msgpack.packb(all_results, default=encode_datetime)
         redis_client.set(cache_key, packed)
@@ -3585,7 +3585,7 @@ class BurstAnalysis(BaseModel):
     modify_fixed_pump_pattern: Optional[dict[str, list]] = None
     modify_variable_pump_pattern: Optional[dict[str, list]] = None
     modify_valve_opening: Optional[dict[str, float]] = None
-    scheme_Name: Optional[str] = None
+    scheme_name: Optional[str] = None
 
 
 @app.post("/burst_analysis/")
@@ -3608,7 +3608,7 @@ async def fastapi_burst_analysis(data: BurstAnalysis) -> str:
             modify_fixed_pump_pattern=item["modify_fixed_pump_pattern"],
             modify_variable_pump_pattern=item["modify_variable_pump_pattern"],
             modify_valve_opening=item["modify_valve_opening"],
-            scheme_Name=item["scheme_Name"],
+            scheme_name=item["scheme_name"],
         )
         # os.rename(filename2, filename)
 
@@ -3616,7 +3616,7 @@ async def fastapi_burst_analysis(data: BurstAnalysis) -> str:
     # 将 时间转换成日期，然后缓存这个计算结果
     # 缓存key: burst_analysis_<name>_<modify_pattern_start_time>
     global redis_client
-    schemename = data.scheme_Name
+    schemename = data.scheme_name
 
     print(data.modify_pattern_start_time)
 
@@ -3627,7 +3627,7 @@ async def fastapi_burst_analysis(data: BurstAnalysis) -> str:
     cache_key = f"queryallschemeallrecords_burst_Analysis_{schemename}_{querydate}"
     data = redis_client.get(cache_key)
     if not data:
-        results = influxdb_api.query_scheme_all_record("burst_Analysis", scheme_Name=schemename, query_date=querydate)
+        results = influxdb_api.query_scheme_all_record("burst_Analysis", scheme_name=schemename, query_date=querydate)
         packed = msgpack.packb(results, default=encode_datetime)  
         redis_client.set(cache_key, packed)
     """
@@ -3712,7 +3712,7 @@ async def fastapi_contaminant_simulation(
     concentration: float,
     duration: int,
     pattern: str = None,
-    scheme_Name: str = None,
+    scheme_name: str = None,
 ) -> str:
     filename = "c:/lock.simulation"
     filename2 = "c:/lock.simulation2"

scripts/online_Analysis.py

@@ -68,7 +68,7 @@ def burst_analysis(
     :param modify_fixed_pump_pattern: dict中包含多个水泵模式，str为工频水泵的id，list为修改后的pattern
     :param modify_variable_pump_pattern: dict中包含多个水泵模式，str为变频水泵的id，list为修改后的pattern
     :param modify_valve_opening: dict中包含多个阀门开启度，str为阀门的id，float为修改后的阀门开启度
-    :param scheme_Name: 方案名称
+    :param scheme_name: 方案名称
     :return:
     """
     scheme_detail: dict = {
@@ -294,7 +294,7 @@ def flushing_analysis(
     modify_valve_opening: dict[str, float] = None,
     drainage_node_ID: str = None,
     flushing_flow: float = 0,
-    scheme_Name: str = None,
+    scheme_name: str = None,
 ) -> None:
     """
     管道冲洗模拟
@@ -304,7 +304,7 @@ def flushing_analysis(
     :param modify_valve_opening: dict中包含多个阀门开启度，str为阀门的id，float为修改后的阀门开启度
     :param drainage_node_ID: 冲洗排放口所在节点ID
     :param flushing_flow: 冲洗水量，传入参数单位为m3/h
-    :param scheme_Name: 方案名称
+    :param scheme_name: 方案名称
     :return:
     """
     print(
@@ -397,7 +397,7 @@ def flushing_analysis(
         modify_total_duration=modify_total_duration,
         modify_valve_opening=modify_valve_opening,
         scheme_Type="flushing_Analysis",
-        scheme_Name=scheme_Name,
+        scheme_name=scheme_name,
     )
     # step 4. restore the base model
     if is_project_open(new_name):
@@ -417,7 +417,7 @@ def contaminant_simulation(
     source: str = None,# 污染源节点ID
     concentration: float = None, # 污染源浓度，单位mg/L
     source_pattern: str = None, # 污染源时间变化模式名称
-    scheme_Name: str = None,
+    scheme_name: str = None,
 ) -> None:
     """
     污染模拟
@@ -428,7 +428,7 @@ def contaminant_simulation(
     :param concentration: 污染源位置处的浓度，单位mg/L，即默认的污染模拟setting为concentration（应改为 Set point booster）
     :param source_pattern: 污染源的时间变化模式，若不传入则默认以恒定浓度持续模拟，时间长度等于duration;
             若传入，则格式为{1.0,0.5,1.1}等系数列表pattern_step模拟等于模型的hydraulic time step
-    :param scheme_Name: 方案名称
+    :param scheme_name: 方案名称
     :return:
     """
     print(
@@ -534,7 +534,7 @@ def contaminant_simulation(
         modify_pattern_start_time=modify_pattern_start_time,
         modify_total_duration=modify_total_duration,
         scheme_Type="contaminant_Analysis",
-        scheme_Name=scheme_Name,
+        scheme_name=scheme_name,
     )
 
     # for i in range(1,operation_step):
@@ -630,7 +630,7 @@ def pressure_regulation(
     modify_tank_initial_level: dict[str, float] = None,
     modify_fixed_pump_pattern: dict[str, list] = None,
     modify_variable_pump_pattern: dict[str, list] = None,
-    scheme_Name: str = None,
+    scheme_name: str = None,
 ) -> None:
     """
     区域调压模拟，用来模拟未来15分钟内，开关水泵对区域压力的影响
@@ -640,7 +640,7 @@ def pressure_regulation(
     :param modify_tank_initial_level: dict中包含多个水塔，str为水塔的id，float为修改后的initial_level
     :param modify_fixed_pump_pattern: dict中包含多个水泵模式，str为工频水泵的id，list为修改后的pattern
     :param modify_variable_pump_pattern: dict中包含多个水泵模式，str为变频水泵的id，list为修改后的pattern
-    :param scheme_Name: 模拟方案名称
+    :param scheme_name: 模拟方案名称
     :return:
     """
     print(
@@ -693,7 +693,7 @@ def pressure_regulation(
         modify_fixed_pump_pattern=modify_fixed_pump_pattern,
         modify_variable_pump_pattern=modify_variable_pump_pattern,
         scheme_Type="pressure_regulation",
-        scheme_Name=scheme_Name,
+        scheme_name=scheme_name,
     )
     if is_project_open(new_name):
         close_project(new_name)
@@ -1536,7 +1536,7 @@ if __name__ == "__main__":
 
     # 示例1：burst_analysis
     # burst_analysis(name='bb', modify_pattern_start_time='2025-04-17T00:00:00+08:00',
-    #                burst_ID='GSD230112144241FA18292A84CB', burst_size=400, modify_total_duration=1800, scheme_Name='GSD230112144241FA18292A84CB_400')
+    #                burst_ID='GSD230112144241FA18292A84CB', burst_size=400, modify_total_duration=1800, scheme_name='GSD230112144241FA18292A84CB_400')
 
     # 示例：create_user
     # create_user(name=project_info.name, username='tjwater dev', password='123456')