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

Fix module import

Browse Source
This commit is contained in:
wqy
2022-09-17 18:42:12 +08:00
parent 47e0b48025
commit 8cf5895f1d
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
api/s4_tanks.py
View File

@@ -2,7 +2,7 @@ from psycopg.rows import Row
from .s0_base import *
from .change_set import ChangeSet
from .s24_coordinates import *
import utility
from .utility import *
OVERFLOW_YES = 'yes'
@@ -16,7 +16,7 @@ def add_tank(name: str, id: str, x: float, y: float, elevation: float, init_leve
def _get_tank(name: str, id: str) -> Row | None:
return utility.query(name, f"select elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow from tanks where id = '{id}'")
return query(name, f"select elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow from tanks where id = '{id}'")
def delete_tank(name: str, id: str) -> ChangeSet:
@@ -33,8 +33,8 @@ def delete_tank(name: str, id: str) -> ChangeSet:
max_level = row['max_level']
diameter = row['diameter']
min_vol = row['min_vol']
vol_curve = utility.decorate(row['vol_curve'], 'str', True)
overflow = utility.decorate(row['overflow'], 'str', True)
vol_curve = decorate(row['vol_curve'], 'str', True)
overflow = decorate(row['overflow'], 'str', True)
sql = f"delete from tanks where id = '{id}';"
undo_sql = f'insert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow) values ("{id}", {elevation}, {init_level}, {min_level}, {max_level}, {diameter}, {min_vol}, {vol_curve}, {overflow});'
@@ -100,7 +100,7 @@ def _set_tank(name: str, id: str, key: str, key_type: str, value: str, optional:
if row == None:
return ChangeSet()
return utility.update(name, TANK, 'tanks', 'id', id, key, key_type, row[key], value, optional)
return update(name, TANK, 'tanks', 'id', id, key, key_type, row[key], value, optional)
def set_tank_elevation(name: str, id: str, elevation: float) -> ChangeSet: