OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
646 Commits 2 Branches 0 Tags
39dfe2bd98d37a24b68011575dcb3ee181e1ba6c
Commit Graph

646 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DingZQ
39dfe2bd98 Refine import inp 2023-02-19 21:34:37 +08:00
DingZQ
2199f54428 Add fastapi for import inp and export inp 2023-02-19 21:24:49 +08:00
DingZQ
26ca2eba02 不能通过IP + Port来定位 client，port每个request都会变化 2023-02-19 17:59:32 +08:00
DingZQ
52c0e8d624 Fixed error of LockPorject 2023-02-19 17:56:13 +08:00
DingZQ
127a6ed606 Add method islockedbyme 2023-02-19 17:46:47 +08:00
DingZQ
ebe58aef14 Use ip + port to identify the client 2023-02-19 17:31:47 +08:00
DingZQ
064b165678 Add method to lock/unlock 2023-02-19 17:12:54 +08:00
王琼钰
178ab15318 Accept Merge Request #153: (api -> master) 
Merge Request: Add more api for snapshot

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/153
 2023-02-17 19:52:06 +08:00
WQY\qiong
28480500d7 Add more api for snapshot 2023-02-17 19:51:44 +08:00
王琼钰
1ce85146d5 Accept Merge Request #151: (api -> master) 
Merge Request: Support to import inp

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/151
 2023-02-16 23:29:01 +08:00
WQY\qiong
78f56ac025 Support to import inp 2023-02-16 23:28:22 +08:00
王琼钰
7556f5e1c2 Accept Merge Request #150: (api -> master) 
Merge Request: Do not close an open project

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/150
 2023-02-16 22:44:07 +08:00
WQY\qiong
1984c537a1 Do not close an open project 2023-02-16 22:43:43 +08:00
王琼钰
366f75c78b Accept Merge Request #149: (api -> master) 
Merge Request: Support to export inp

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/149
 2023-02-16 22:39:58 +08:00
WQY\qiong
b40e8862a7 Support to export inp 2023-02-16 22:39:31 +08:00
王琼钰
83f64963f4 Accept Merge Request #148: (api -> master) 
Merge Request: More scada api and set restore operation

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/148
 2023-02-16 22:20:28 +08:00
WQY\qiong
8f55b21275 Support to set restore operation 2023-02-16 22:18:51 +08:00
WQY\qiong
3c7903e742 Test more api for scada_data 2023-02-16 22:14:31 +08:00
WQY\qiong
11a5bb4333 Add more api for scada_data 2023-02-16 22:14:07 +08:00
WQY\qiong
93f5321c89 Test scada_model.status 2023-02-16 21:21:37 +08:00
WQY\qiong
e62107da07 Support scada_model.status in API 2023-02-16 21:21:21 +08:00
WQY\qiong
6ba4dc2ed7 Add 'status' field to scada_model 2023-02-16 21:20:21 +08:00
王琼钰
61dfd0ffc0 Accept Merge Request #135: (api -> master) 
Merge Request: Add scada API

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/135
 2023-02-10 08:45:15 +08:00
WQY\qiong
8c21ebb48c Fix order 2023-02-10 01:47:46 +08:00
WQY\qiong
e5f67af36b Add comment for iso time format 2023-02-10 01:47:19 +08:00
WQY\qiong
62a1303b8f Add scada_data test 2023-02-10 01:45:23 +08:00
WQY\qiong
5edd986ce6 Add scada_data api 2023-02-10 01:44:29 +08:00
WQY\qiong
14c57bb313 Add scada_model test 2023-02-10 00:47:53 +08:00
WQY\qiong
e18a2a529e Add scada_model api 2023-02-10 00:47:37 +08:00
WQY\qiong
1c5de25694 Deploy scada table 2023-02-10 00:47:04 +08:00
WQY\qiong
de6e4284d7 Add table scada_data 2023-02-10 00:46:32 +08:00
WQY\qiong
1520847813 Add table scada_model 2023-02-10 00:46:16 +08:00
王琼钰
e0d8649839 Accept Merge Request #134: (api -> master) 
Merge Request: Build suzhouhe

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/134
 2023-02-09 00:11:42 +08:00
WQY\qiong
d04dea6b60 Build suzhouhe 2023-02-09 00:11:08 +08:00
王琼钰
9033c2731d Accept Merge Request #133: (api -> master) 
Merge Request: Fix reading inp bug

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/133
 2023-02-09 00:08:57 +08:00
WQY\qiong
8979885eac Fix reading inp bug 2023-02-09 00:08:36 +08:00
王琼钰
c5f269ac5b Accept Merge Request #126: (api -> master) 
Merge Request: Add suzhouhe.inp

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/126
 2023-02-04 21:25:23 +08:00
WQY\qiong
7f9c9a8e8c Add suzhouhe.inp 2023-02-04 21:24:33 +08:00
王琼钰
61ce7f7744 Accept Merge Request #125: (api -> master) 
Merge Request: Test cascade deletion

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/125
 2023-02-04 16:27:04 +08:00
WQY\qiong
73ec2faa97 Test curve cascade deletion 2023-02-04 16:26:05 +08:00
WQY\qiong
719e63e572 Test pattern cascade deletion 2023-02-04 16:25:45 +08:00
WQY\qiong
ae793d8ab5 Workaround to prevent pump (cascade) deletion... 2023-02-04 16:25:14 +08:00
WQY\qiong
133ba32cdf Fix unset_demand_by_pattern cs 2023-02-04 16:00:44 +08:00
WQY\qiong
d3e8e63e1b Fix unset_pump_energy_by_curve return value 2023-02-04 16:00:23 +08:00
WQY\qiong
41b923a838 Fix unset_pump_energy_by_pattern return value 2023-02-04 15:59:34 +08:00
WQY\qiong
2d0598ca5d Fix test name 2023-02-04 15:58:51 +08:00
WQY\qiong
6e6fc67677 Test valve cascade deletion 2023-02-04 15:08:27 +08:00
WQY\qiong
685c8a3a33 Test pump cascade deletion 2023-02-04 15:08:08 +08:00
WQY\qiong
63175956ef Test pipe cascade deletion 2023-02-04 15:07:36 +08:00
WQY\qiong
15d14765bd Remove debug info 2023-02-04 15:07:01 +08:00