OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
685 Commits 2 Branches 0 Tags
11a3cb7a78179f51a4eebfcdb134c7ac28b0057a
Commit Graph

685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
王琼钰
11a3cb7a78 Accept Merge Request #171: (list-snapshot -> master) 
Merge Request: Support to list snapshot

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/171?initial=true
 2023-03-03 20:40:38 +08:00
WQY\qiong
dde045b6b8 Support to list snapshot 2023-03-03 20:40:05 +08:00
王琼钰
7f23208022 Accept Merge Request #167: (fix-snapshot -> master) 
Merge Request: Fix snapshot api

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/167?initial=true
 2023-03-02 21:33:14 +08:00
WQY\qiong
43e0f8189a Try query 2023-03-02 21:32:22 +08:00
王琼钰
bb3cd2bb7f Accept Merge Request #166: (api -> master) 
Merge Request: Add EPANET2 output format

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/166?initial=true
 2023-03-01 22:06:15 +08:00
WQY\qiong
e83d3a83a5 Add EPANET2 output format 2023-03-01 22:05:34 +08:00
WQY\qiong
cf76427562 Add placeholder for tank 2023-03-01 22:04:27 +08:00
DingZQ
fe04ccd9d0 Merge branch 'master' of https://e.coding.net/tjwater/tjwatercloud/TJWaterServer 2023-03-01 21:35:38 +08:00
DingZQ
de48af215f Refine unlock 2023-03-01 21:35:31 +08:00
WQY\qiong
0fd75701f0 Add placeholder for tank 2023-03-01 21:20:46 +08:00
WQY\qiong
1f85a52378 Remove deprecated keyword 2023-02-28 23:10:48 +08:00
WQY\qiong
ecbd4134fb Ignore TODO.md 2023-02-28 23:06:58 +08:00
王琼钰
69c25bb008 Accept Merge Request #165: (api -> master) 
Merge Request: Add EPANET2 input format

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/165?initial=true
 2023-02-28 23:05:26 +08:00
WQY\qiong
ee829c0731 Add EPANET2 input format 2023-02-28 23:04:46 +08:00
DingZQ
2f66ae4dff Change operationid to operation 2023-02-27 23:31:36 +08:00
DingZQ
2e5705e2f2 Add method for tag and operation 2023-02-27 23:17:35 +08:00
DingZQ
0e8388859a Add method fastapi_set_restore_operation 2023-02-27 22:41:38 +08:00
DingZQ
87c9790d3b Refine 2023-02-24 22:48:09 +08:00
DingZQ
98cf6277a8 Refine 2023-02-24 22:44:31 +08:00
DingZQ
9a12091691 Refine 2023-02-24 22:42:08 +08:00
DingZQ
2abc190a65 Refine 2023-02-24 22:41:12 +08:00
DingZQ
0b9ccf5d5c Refine 2023-02-24 22:40:13 +08:00
DingZQ
b35a0865b9 Return empty if cna't be locked 2023-02-24 22:36:02 +08:00
DingZQ
6b956e6c09 Merge branch 'master' of https://e.coding.net/tjwater/tjwatercloud/TJWaterServer 2023-02-24 20:52:09 +08:00
DingZQ
ed23f119f9 Update exportinp 2023-02-24 20:49:41 +08:00
WQY\qiong
97c409535f Add epanet3 file 2023-02-24 18:11:14 +08:00
王琼钰
3f7bfb6554 Accept Merge Request #164: (api -> master) 
Merge Request: Refine scada api

Created By: @王琼钰
Accepted By: @王琼钰
URL: https://tjwater.coding.net/p/tjwatercloud/d/TJWaterServer/git/merge/164?initial=true
 2023-02-24 18:08:33 +08:00
WQY\qiong
7aae885ef1 Add epanet version 2 2023-02-24 15:38:20 +08:00
WQY\qiong
1e5cfbe595 Test new scada api 2023-02-24 15:23:41 +08:00
WQY\qiong
0fb621112a Optimize scada sql 2023-02-24 15:22:38 +08:00
WQY\qiong
aac46ac056 Fix scada device update api 2023-02-24 14:43:02 +08:00
WQY\qiong
6645c7341a Update build_db script 2023-02-24 14:05:02 +08:00
WQY\qiong
db8329aa70 Support scada batch operation 2023-02-24 14:02:59 +08:00
WQY\qiong
fd03105614 Refine scada api 2023-02-24 13:47:59 +08:00
WQY\qiong
cef631b41b Refine scada tables 2023-02-24 13:47:24 +08:00
WQY\qiong
c3ae9b306f Fix snapshot api and test 2023-02-24 13:46:19 +08:00
DingZQ
c5c526286b Set response type to plaintext 2023-02-19 21:46:17 +08:00
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
WQY\qiong
e88478fc13 Improve update snapshot 2023-02-17 21:35:08 +08:00
WQY\qiong
68b42ef2a0 Add comment for scada data api 2023-02-17 21:29:17 +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