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

Fix return type mismatch

Browse Source
This commit is contained in:
wqy
2022-09-17 22:34:27 +08:00
parent 2aa967546a
commit a645195eb5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/s5_pipes.py
View File

@@ -47,12 +47,12 @@ def delete_pipe(name: str, id: str) -> ChangeSet:
def get_pipe_node1(name: str, id: str) -> str | None:
row = _get_pipe(name, id)
return float(row['node1']) if row != None else None
return row['node1'] if row != None else None
def get_pipe_node2(name: str, id: str) -> str | None:
row = _get_pipe(name, id)
return float(row['node2']) if row != None else None
return row['node2'] if row != None else None
def get_pipe_length(name: str, id: str) -> float | None:
@@ -77,7 +77,7 @@ def get_pipe_minor_loss(name: str, id: str) -> float | None:
def get_pipe_status(name: str, id: str) -> str | None:
row = _get_pipe(name, id)
return float(row['status']) if row != None else None
return row['status'] if row != None else None
def _set_pipe(name: str, id: str, key: str, key_type: str, value: str, optional: bool = False) -> ChangeSet:

4
api/s6_pumps.py
View File

@@ -39,12 +39,12 @@ def delete_pump(name: str, id: str) -> ChangeSet:
def get_pump_node1(name: str, id: str) -> str | None:
row = _get_pump(name, id)
return float(row['node1']) if row != None else None
return row['node1'] if row != None else None
def get_pump_node2(name: str, id: str) -> str | None:
row = _get_pump(name, id)
return float(row['node2']) if row != None else None
return row['node2'] if row != None else None
def get_pump_power(name: str, id: str) -> str | None: pass

6
api/s7_valves.py
View File

@@ -47,12 +47,12 @@ def delete_valve(name: str, id: str) -> ChangeSet:
def get_valve_node1(name: str, id: str) -> str | None:
row = _get_valve(name, id)
return float(row['node1']) if row != None else None
return row['node1'] if row != None else None
def get_valve_node2(name: str, id: str) -> str | None:
row = _get_valve(name, id)
return float(row['node2']) if row != None else None
return row['node2'] if row != None else None
def get_valve_diameter(name: str, id: str) -> float | None:
@@ -62,7 +62,7 @@ def get_valve_diameter(name: str, id: str) -> float | None:
def get_valve_type(name: str, id: str) -> str | None:
row = _get_valve(name, id)
return float(row['type']) if row != None else None
return row['type'] if row != None else None
def get_valve_setting(name: str, id: str) -> float | None: