统一scheme_name命名规则

app/api/v1/endpoints/data_query.py

@@ -316,7 +316,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)
@@ -334,7 +334,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)

app/api/v1/endpoints/extension.py

@@ -22,7 +22,7 @@ async def get_all_extension_data_endpoint(network: str) -> dict[str, Any]:
 async def get_extension_data_endpoint(network: str, key: str) -> str | None:
     return get_extension_data(network, key)
 
-@router.post("/setextensiondata", response_model=None)
+@router.post("/setextensiondata/", response_model=None)
 async def set_extension_data_endpoint(network: str, req: Request) -> ChangeSet:
     props = await req.json()
     print(props)

app/api/v1/endpoints/simulation.py

@@ -60,7 +60,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
 
 
 class SchedulingAnalysis(BaseModel):
@@ -78,7 +78,7 @@ class PressureRegulation(BaseModel):
     pump_control: dict
     tank_init_level: Optional[dict] = None
     duration: Optional[int] = 900
-    scheme_Name: Optional[str] = None
+    scheme_name: Optional[str] = None
 
 
 class ProjectManagement(BaseModel):
@@ -239,9 +239,29 @@ async def fastapi_valve_close_analysis(
 
 @router.get("/valve_isolation_analysis/")
 async def valve_isolation_endpoint(
-    network: str, accident_element: List[str] = Query(...)
+    network: str,
+    accident_element: List[str] = Query(...),
+    disabled_valves: List[str] = Query(None),
 ):
-    return analyze_valve_isolation(network, accident_element)
+    result = {
+        "accident_element": "P461309",
+        "accident_elements": ["P461309"],
+        "affected_nodes": [
+            "J316629_A",
+            "J317037_B",
+            "J317060_B",
+            "J408189_B",
+            "J499996",
+            "J524940",
+            "J535933",
+            "J58841",
+        ],
+        "isolatable": True,
+        "must_close_valves": ["210521658", "V12974", "V12986", "V12993"],
+        "optional_valves": [],
+    }
+    result = analyze_valve_isolation(network, accident_element, disabled_valves)
+    return result
 
 
 @router.get("/flushinganalysis/")
@@ -342,7 +362,7 @@ async def fastapi_pressure_regulation(data: PressureRegulation) -> str:
         modify_tank_initial_level=item["tank_init_level"],
         modify_fixed_pump_pattern=fixed_pump_pattern or None,
         modify_variable_pump_pattern=variable_pump_pattern or None,
-        scheme_Name=item["scheme_Name"],
+        scheme_name=item["scheme_name"],
     )
     return "success"