OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #35: (api -> master)

Browse Source 
Merge Request: Include links property

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/35
This commit is contained in:
王琼钰
2022-09-22 21:46:03 +08:00
parent b30aa7cbca 9905d7f022
commit 23050fd3d1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/s3_reservoirs.py
View File

@@ -63,7 +63,7 @@ def set_reservoir_coord(name: str, id: str, x: float, y: float) -> ChangeSet:
def get_reservoir_property_names(name: str) -> list[str]:
return ['head', 'pattern', 'coord']
return ['head', 'pattern', 'coord', 'links']
def get_reservoir_properties(name: str, id: str) -> dict[str, Any] | None:

3
api/s4_tanks.py
View File

@@ -100,7 +100,7 @@ def set_tank_coord(name: str, id: str, x: float, y: float) -> ChangeSet:
def get_tank_property_names(name: str) -> list[str]:
return ['elevation', 'init_level', 'min_level', 'max_level', 'diameter', 'min_vol', 'vol_curve', 'overflow', 'coord']
return ['elevation', 'init_level', 'min_level', 'max_level', 'diameter', 'min_vol', 'vol_curve', 'overflow', 'coord', 'links']
def get_tank_properties(name: str, id: str) -> dict[str, Any] | None:
@@ -118,4 +118,5 @@ def get_tank_properties(name: str, id: str) -> dict[str, Any] | None:
ps['vol_curve'] = row['vol_curve'] if row != None and row['vol_curve'] != None else None
ps['overflow'] = row['overflow'] if row != None and row['overflow'] != None else None
ps['coord'] = get_node_coord(name, id)
ps['links'] = get_node_links(name, id)
return ps