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

Merge branch 'master' of https://e.coding.net/tjwater/tjwatercloud/TJWaterServer

Browse Source
This commit is contained in:
DingZQ
2022-09-15 14:16:55 +08:00
parent f7f1d9c0f3 bb859bb946
commit 7940b34386
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/s2_junctions.py
View File

@@ -40,7 +40,7 @@ def delete_junction(name: str, id: str) -> ChangeSet:
pattern = 'NULL' if row['pattern'] == None else row['pattern']
pattern = f'"{pattern}"' if pattern != 'NULL' else pattern
cur.execute(f"select * from coordinates where id = '{id}'")
cur.execute(f"select * from coordinates where node = '{id}'")
row = cur.fetchone()
if row == None:
return
@@ -53,9 +53,9 @@ def delete_junction(name: str, id: str) -> ChangeSet:
cur.execute(sql)
redo = sql.replace("'", '"')
undo = f'insert into _node (id, type) values ("{id}", "{type}");'
undo += f" insert into junctions (id, elevation, demand, pattern) values ('{id}', {elevation}, {demand}, {pattern});"
undo += f" insert into coordinates (node, coord) values ('{id}', '{coord}');"
undo = f'insert into _node (id, type) values ("{id}", "JUNCTION");'
undo += f' insert into junctions (id, elevation, demand, pattern) values ("{id}", {elevation}, {demand}, {pattern});'
undo += f' insert into coordinates (node, coord) values ("{id}", "{coord}");'
add_operation(name, redo, undo)
change = ChangeSet()