修复丢失的api；重新规划api结构

app/api/v1/endpoints/network/demands.py

@@ -30,5 +30,26 @@ async def fastapi_set_demand_properties(
 ############################################################
 # water distribution 36.[Water Distribution]
 ############################################################
-# This section was empty in main.py, so skipping unless found elsewhere or needed.
-# If there are specific Water Distribution endpoints they should go here.
+@router.get("/calculatedemandtonodes/")
+async def fastapi_calculate_demand_to_nodes(
+    network: str, req: Request
+) -> dict[str, float]:
+    props = await req.json()
+    demand = props["demand"]
+    nodes = props["nodes"]
+    return calculate_demand_to_nodes(network, demand, nodes)
+
+@router.get("/calculatedemandtoregion/")
+async def fastapi_calculate_demand_to_region(
+    network: str, req: Request
+) -> dict[str, float]:
+    props = await req.json()
+    demand = props["demand"]
+    region = props["region"]
+    return calculate_demand_to_region(network, demand, region)
+
+@router.get("/calculatedemandtonetwork/")
+async def fastapi_calculate_demand_to_network(
+    network: str, demand: float
+) -> dict[str, float]:
+    return calculate_demand_to_network(network, demand)

app/api/v1/endpoints/network/geometry.py

@@ -1,6 +1,9 @@
-from fastapi import APIRouter, Request
+from fastapi import APIRouter, Request, Depends
 from typing import Any, List, Dict, Union
 from app.services.tjnetwork import *
+from app.api.v1.endpoints.auth import verify_token
+from app.infra.cache.redis_client import redis_client, encode_datetime, decode_datetime
+import msgpack
 
 router = APIRouter()
 
@@ -22,6 +25,10 @@ async def fastapi_set_coord(network: str, req: Request) -> ChangeSet:
     props = await req.json()
     return set_coord(network, ChangeSet(props))
 
+@router.get("/getnodecoord/")
+async def fastapi_get_node_coord(network: str, node: str) -> dict[str, float] | None:
+    return get_node_coord(network, node)
+
 # Additional geometry queries found in main.py logic (implicit or explicit)
 @router.get("/getnetworkinextent/")
 async def fastapi_get_network_in_extent(
@@ -29,9 +36,38 @@ async def fastapi_get_network_in_extent(
 ) -> dict[str, Any]:
     return get_network_in_extent(network, x1, y1, x2, y2)
 
+@router.get("/getnetworkgeometries/", dependencies=[Depends(verify_token)])
+async def fastapi_get_network_geometries(network: str) -> dict[str, Any] | None:
+    cache_key = f"getnetworkgeometries_{network}"
+    data = redis_client.get(cache_key)
+    if data:
+        loaded_dict = msgpack.unpackb(data, object_hook=decode_datetime)
+        return loaded_dict
+
+    coords = get_network_node_coords(network)
+    nodes = []
+    for node_id, coord in coords.items():
+        nodes.append(f"{node_id}:{coord['type']}:{coord['x']}:{coord['y']}")
+    links = get_network_link_nodes(network)
+    scadas = get_all_scada_info(network)
+
+    results = {"nodes": nodes, "links": links, "scadas": scadas}
+    redis_client.set(cache_key, msgpack.packb(results, default=encode_datetime))
+    return results
+
 @router.get("/getmajornodecoords/")
-async def fastapi_get_majornode_coords(network: str) -> list[Any]:
-    return get_majornode_coords(network)
+async def fastapi_get_majornode_coords(
+    network: str, diameter: int
+) -> dict[str, dict[str, float]]:
+    return get_major_node_coords(network, diameter)
+
+@router.get("/getmajorpipenodes/")
+async def fastapi_get_major_pipe_nodes(network: str, diameter: int) -> list[str] | None:
+    return get_major_pipe_nodes(network, diameter)
+
+@router.get("/getnetworklinknodes/")
+async def fastapi_get_network_link_nodes(network: str) -> list[str] | None:
+    return get_network_link_nodes(network)
 
 @router.get("/getallcoords/")
 async def fastapi_get_all_coords(network: str) -> list[Any]:

app/api/v1/endpoints/network/regions.py

@@ -231,3 +231,15 @@ async def fastapi_generate_virtual_district(
 ) -> ChangeSet:
     props = await req.json()
     return generate_virtual_district(network, props["centers"], inflate_delta)
+
+@router.get("/calculatedistrictmeteringareafornodes/")
+async def fastapi_calculate_district_metering_area_for_nodes(
+    network: str, req: Request
+) -> list[list[str]]:
+    props = await req.json()
+    nodes = props["nodes"]
+    part_count = props["part_count"]
+    part_type = props["part_type"]
+    return calculate_district_metering_area_for_nodes(
+        network, nodes, part_count, part_type
+    )