add valve

This commit is contained in:
DingZQ
2022-10-16 11:36:22 +08:00
parent 23be653faa
commit 01efc2136c

18
main.py
View File

@@ -6,6 +6,7 @@ import json
from platform import node from platform import node
from typing import * from typing import *
from urllib.request import Request from urllib.request import Request
from xml.dom import minicompat
from fastapi import FastAPI, File, UploadFile from fastapi import FastAPI, File, UploadFile
from pydantic import BaseModel from pydantic import BaseModel
from starlette.responses import FileResponse, JSONResponse from starlette.responses import FileResponse, JSONResponse
@@ -526,7 +527,12 @@ async def fast_get_pipe_schema(network: str) -> dict[str, dict[str, Any]]:
async def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet: async def fastapi_add_pipe(network: str, pipe: str, node1: str, node2: str, length: float = 0, diameter: float = 0, roughness: float = 0, minor_loss: float = 0, status: str = PIPE_STATUS_OPEN) -> ChangeSet:
ps = { 'id' : pipe, ps = { 'id' : pipe,
'node1' : node1, 'node1' : node1,
'node2' : node2 'node2' : node2,
'length' : length,
'diameter' : diameter,
'roughness' : roughness,
'minor_loss' : minor_loss,
'status' : status
} }
return add_pipe(network, ChangeSet(ps)) return add_pipe(network, ChangeSet(ps))
@@ -682,7 +688,15 @@ async def fast_get_valve_schema(network: str) -> dict[str, dict[str, Any]]:
@app.post("/addvalve/") @app.post("/addvalve/")
async def fastapi_add_valve(network: str, valve: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet: async def fastapi_add_valve(network: str, valve: str, node1: str, node2: str, diameter: float = 0, type: str = VALVES_TYPE_PRV, setting: float = 0, minor_loss: float = 0) -> ChangeSet:
return add_valve(network, valve, node1, node2, diameter, type, setting, minor_loss) ps = { 'id' : valve,
'node1' : node1,
'node2' : node2,
'diameter' : diameter,
'type' : type,
'setting' : setting,
'minor_loss' : minor_loss }
return add_valve(network, ChangeSet(ps))
@app.post("/deletevalve/") @app.post("/deletevalve/")
async def fastapi_delete_valve(network: str, valve: str) -> ChangeSet: async def fastapi_delete_valve(network: str, valve: str) -> ChangeSet: