13621160019@163.com
|
1ed1eb77c7
|
removed unnecessory validator in tenant batch analysis report in API
Merge branch 'develop'
|
2021-05-19 15:10:38 +08:00 |
|
13621160019@163.com
|
1a9b73f092
|
removed unnecessory validator in tenant batch analysis report in API
|
2021-05-19 15:08:04 +08:00 |
|
13621160019@163.com
|
50d9b5de63
|
added Store Batch Analysis Report
Merge branch 'develop'
|
2021-05-19 15:01:21 +08:00 |
|
13621160019@163.com
|
465f60768b
|
added Store Batch Analysis Report
Merge branch 'PR43' into develop
|
2021-05-19 14:59:51 +08:00 |
|
13621160019@163.com
|
e269861a8e
|
Merge branch 'develop'
|
2021-05-18 14:38:32 +08:00 |
|
13621160019@163.com
|
b8f3d1f431
|
replaced fetchone with fetchall to avoid error in case there are duplicate rows in API
|
2021-05-18 14:36:53 +08:00 |
|
YangZhang-GitHub
|
2494c73bd0
|
Modify variable name
|
2021-05-18 10:56:40 +08:00 |
|
YangZhang-GitHub
|
a8a89c77b8
|
The StoreBatch page display function is completed
|
2021-05-17 18:10:38 +08:00 |
|
YangZhang-GitHub
|
9ca3752945
|
Implemented the storebatch Excel Exporter
|
2021-05-17 17:25:29 +08:00 |
|
YangZhang-GitHub
|
1a8148845d
|
The storebatch API has been completed
|
2021-05-17 16:59:42 +08:00 |
|
YangZhang-GitHub
|
a3b82aafc3
|
Added storebatch API
|
2021-05-17 16:58:27 +08:00 |
|
13621160019@163.com
|
da63661418
|
added excel exporter of tenant batch
Merge branch 'develop'
|
2021-05-13 10:06:40 +08:00 |
|
13621160019@163.com
|
e868491db8
|
added excel exporter of tenant batch analysis report
|
2021-05-13 10:04:25 +08:00 |
|
13621160019@163.com
|
0963035078
|
added excel exporter of tenant batch report
Merge branch 'master' into develop
|
2021-05-13 09:55:50 +08:00 |
|
13621160019@163.com
|
12e2864e0f
|
added excel exporter of tenant batch report
|
2021-05-13 09:54:53 +08:00 |
|
13621160019@163.com
|
a1f49c12b9
|
added tenant batch report
Merge branch 'develop'
|
2021-05-13 08:34:16 +08:00 |
|
13621160019@163.com
|
13249842e6
|
added Tenant Batch Analysis Report
|
2021-05-13 08:19:05 +08:00 |
|
13621160019@163.com
|
97c75fe001
|
removed unsupported sql statement from database upgrade script
Merge branch 'develop'
|
2021-05-08 14:00:22 +08:00 |
|
13621160019@163.com
|
900470e016
|
removed unsupported sql statement from database upgrade script
|
2021-05-08 14:00:04 +08:00 |
|
13621160019@163.com
|
00eff6582c
|
implemented virtual point calculating in myems-normalization service
Merge branch 'develop'
|
2021-05-08 13:38:41 +08:00 |
|
13621160019@163.com
|
95983aaf4e
|
implemented virtual point calculating in myems-normalization service
|
2021-05-08 13:37:17 +08:00 |
|
13621160019@163.com
|
964aa4c3b7
|
updated README
Merge branch 'develop'
|
2021-05-07 10:20:16 +08:00 |
|
13621160019@163.com
|
aee2ca5b53
|
updated README
|
2021-05-07 10:20:03 +08:00 |
|
13621160019@163.com
|
1a2f274f1f
|
added is_virtual to point
Merge branch 'develop'
|
2021-05-07 09:02:53 +08:00 |
|
13621160019@163.com
|
2cefdcb705
|
added is_virtual to point in myems-bacnet and myems-modbus-tcp
|
2021-05-07 09:01:56 +08:00 |
|
13621160019@163.com
|
bb875521ef
|
added is_virtual to point in myems-admin
|
2021-05-07 09:01:19 +08:00 |
|
13621160019@163.com
|
f9b72c6997
|
added is_virtual to point in myems-api
|
2021-05-07 09:00:13 +08:00 |
|
13621160019@163.com
|
357d1b3802
|
added is_virtual to tbl_points in database
Merge branch 'develop'
|
2021-05-05 07:47:14 +08:00 |
|
13621160019@163.com
|
e45de9c394
|
added is_virtual to tbl_points in database
|
2021-05-05 07:43:39 +08:00 |
|
13621160019@163.com
|
5f31c92de8
|
updated metertracking report by adding point type condition to meter point query string
Merge branch 'develop'
|
2021-05-03 18:34:58 +08:00 |
|
13621160019@163.com
|
cefeef57db
|
updated metertracking report by adding point type condition to meter point query string
|
2021-05-03 18:33:08 +08:00 |
|
13621160019@163.com
|
748a94aacd
|
added start value and end value to metertracking report
Merge branch 'develop'
|
2021-05-03 12:42:16 +08:00 |
|
13621160019@163.com
|
2ae9fca00f
|
added start value and end value to metertracking report
Merge branch 'PR40' into develop
|
2021-05-03 12:41:34 +08:00 |
|
13621160019@163.com
|
77c5a4fb2d
|
updated metertracking report to reduce duplicated meters
|
2021-05-03 12:41:21 +08:00 |
|
13621160019@163.com
|
981d05c4dc
|
updated comments and log messages in myems-modbust-tcp service
Merge branch 'develop'
|
2021-05-01 20:10:38 +08:00 |
|
13621160019@163.com
|
9126d1981a
|
updated comments and log messages in myems-modbust-tcp service
|
2021-05-01 20:10:23 +08:00 |
|
13621160019@163.com
|
5d7dae3e31
|
added gateway procedure to myems-modbus-tcp service
Merge branch 'develop'
|
2021-04-30 14:20:56 +08:00 |
|
13621160019@163.com
|
041171c28d
|
added gateway procedure to myems-modbus-tcp service
|
2021-04-30 14:19:50 +08:00 |
|
13621160019@163.com
|
0a9ccedb32
|
added gateway process to myems-modbus-tcp service
Merge branch 'develop'
|
2021-04-30 14:08:43 +08:00 |
|
13621160019@163.com
|
afe05816b5
|
added gateway process to myems-modbus-tcp service
|
2021-04-30 14:07:46 +08:00 |
|
13621160019@163.com
|
bbc44bba05
|
added multiprocessing to main of myems-bacnet service
|
2021-04-30 12:41:48 +08:00 |
|
13621160019@163.com
|
b87d41af87
|
added multiprocessing to main of myems-bacnet service
|
2021-04-30 12:40:50 +08:00 |
|
13621160019@163.com
|
3eebbbc533
|
Merge branch 'master' into develop
|
2021-04-30 12:32:40 +08:00 |
|
13621160019@163.com
|
6f92e88ece
|
removed schedule library from gateway process in myems-bacnet service
|
2021-04-30 12:27:38 +08:00 |
|
13621160019@163.com
|
050304256f
|
added gateway process to myems-bacnet service
Merge branch 'develop'
|
2021-04-30 11:28:11 +08:00 |
|
13621160019@163.com
|
546365dc74
|
added gateway process to myems-bacnet service
|
2021-04-30 11:27:54 +08:00 |
|
13621160019@163.com
|
c014ee5030
|
added gateway process to myems-bacnet service
Merge branch 'develop'
|
2021-04-30 10:46:30 +08:00 |
|
13621160019@163.com
|
6bedd5d73c
|
added gateway process to myems-bacnet service
|
2021-04-30 10:46:00 +08:00 |
|
YangZhang-GitHub
|
c6f4ed9003
|
Completed the start and end values increase
|
2021-04-29 20:23:18 +08:00 |
|
13621160019@163.com
|
3906770cd8
|
added procedure to update last seen datetime of data source in myems-modbus server
Merge branch 'develop'
|
2021-04-29 11:34:00 +08:00 |