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

Refine code with cursor

Browse Source
This commit is contained in:
DingZQ
2025-02-28 21:16:42 +08:00
parent ae60649726
commit 0d4128c8c8
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
api/s9_demands.py
View File

@@ -1,4 +1,5 @@
from .database import *
from .database import read_all, ChangeSet, DbChangeSet, g_update_prefix, execute_command, try_read
from typing import Any
def get_demand_schema(name: str) -> dict[str, dict[str, Any]]:
return { 'junction' : {'type': 'str' , 'optional': False , 'readonly': True },
@@ -34,8 +35,8 @@ def _set_demand(name: str, cs: ChangeSet) -> DbChangeSet:
pattern = str(r['pattern']) if 'pattern' in r and r['pattern'] != None else None
category = str(r['category']) if 'category' in r and r['category'] != None else None
f_demand = demand
f_pattern = f"'{pattern}'" if pattern != None else 'null'
f_category = f"'{category}'" if category != None else 'null'
f_pattern = f"'{pattern}'" if pattern is not None else 'null'
f_category = f"'{category}'" if category is not None else 'null'
redo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});"
new['demands'].append({ 'demand': demand, 'pattern': pattern, 'category': category })
@@ -45,8 +46,8 @@ def _set_demand(name: str, cs: ChangeSet) -> DbChangeSet:
pattern = str(r['pattern']) if 'pattern' in r and r['pattern'] != None else None
category = str(r['category']) if 'category' in r and r['category'] != None else None
f_demand = demand
f_pattern = f"'{pattern}'" if pattern != None else 'null'
f_category = f"'{category}'" if category != None else 'null'
f_pattern = f"'{pattern}'" if pattern is not None else 'null'
f_category = f"'{category}'" if category is not None else 'null'
undo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});"
redo_cs = g_update_prefix | { 'type': 'demand' } | new
@@ -75,28 +76,28 @@ def inp_in_demand(line: str) -> str:
junction = str(tokens[0])
demand = float(tokens[1])
pattern = str(tokens[2]) if num_without_desc >= 3 else None
pattern = f"'{pattern}'" if pattern != None else 'null'
pattern = f"'{pattern}'" if pattern is not None else 'null'
category = str(tokens[3]) if num_without_desc >= 4 else None
category = f"'{category}'" if category != None else 'null'
category = f"'{category}'" if category is not None else 'null'
return str(f"insert into demands (junction, demand, pattern, category) values ('{junction}', {demand}, {pattern}, {category});")
def inp_out_demand(name: str) -> list[str]:
lines = []
objs = read_all(name, f"select * from demands order by _order")
objs = read_all(name, "select * from demands order by _order")
for obj in objs:
junction = obj['junction']
demand = obj['demand']
pattern = obj['pattern'] if obj['pattern'] != None else ''
category = f";{obj['category']}" if obj['category'] != None else ';'
pattern = obj['pattern'] if obj['pattern'] is not None else ''
category = f";{obj['category']}" if obj['category'] is not None else ';'
lines.append(f'{junction} {demand} {pattern} {category}')
return lines
def delete_demand_by_junction(name: str, junction: str) -> ChangeSet:
row = try_read(name, f"select * from demands where junction = '{junction}'")
if row == None:
if row is None:
return ChangeSet()
return ChangeSet(g_update_prefix | {'type': 'demand', 'junction': junction, 'demands': []})