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

Clean junction and reservoir

Browse Source
This commit is contained in:
wqy
2022-09-17 09:44:05 +08:00
parent 64b6a1521d
commit 146048ac62
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/s2_junctions.py
View File

@@ -1,6 +1,5 @@
from psycopg.rows import Row from psycopg.rows import Row
from .s0_base import * from .s0_base import *
from .operation import *
from .change_set import ChangeSet from .change_set import ChangeSet
from .s24_coordinates import * from .s24_coordinates import *
import utility import utility
@@ -79,6 +78,9 @@ def set_junction_demand(name: str, id: str, demand: float) -> ChangeSet:
def set_junction_pattern(name: str, id: str, pattern: str) -> ChangeSet: def set_junction_pattern(name: str, id: str, pattern: str) -> ChangeSet:
if not is_pattern(name, pattern):
return ChangeSet()
return _set_junction(name, id, 'pattern', 'str', pattern, True) return _set_junction(name, id, 'pattern', 'str', pattern, True)

9
api/s3_reservoirs.py
View File

@@ -1,7 +1,5 @@
from psycopg.rows import dict_row, Row from psycopg.rows import Row
from .connection import g_conn_dict as conn
from .s0_base import * from .s0_base import *
from .operation import *
from .change_set import ChangeSet from .change_set import ChangeSet
from .s24_coordinates import * from .s24_coordinates import *
import utility import utility
@@ -14,7 +12,7 @@ def add_reservoir(name: str, id: str, x: float, y: float, head: float) -> Change
def _get_reservoir(name: str, id: str) -> Row | None: def _get_reservoir(name: str, id: str) -> Row | None:
return utility.query(f"select head, pattern from reservoirs where id = '{id}'") return utility.query(name, f"select head, pattern from reservoirs where id = '{id}'")
def delete_reservoir(name: str, id: str) -> ChangeSet: def delete_reservoir(name: str, id: str) -> ChangeSet:
@@ -67,6 +65,9 @@ def set_reservoir_head(name: str, id: str, head: float) -> ChangeSet:
def set_reservoir_pattern(name: str, id: str, pattern: str) -> ChangeSet: def set_reservoir_pattern(name: str, id: str, pattern: str) -> ChangeSet:
if not is_pattern(name, id):
return ChangeSet()
return _set_reservoir(name, id, 'pattern', 'str', pattern, True) return _set_reservoir(name, id, 'pattern', 'str', pattern, True)