OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
812 Commits 2 Branches 0 Tags
55e52ff4fcf97847ff9340b149500b61db9fa8be
Commit Graph

812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
王琼钰
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