Commit Graph

2104 Commits (90e097306f881fb4a039ca9b3ca6e7163b93be7b)

Author SHA1 Message Date
13621160019@163.com d3ca99e516 updated mysql-connector-python version in README 2022-01-30 20:12:19 +08:00
13621160019@163.com 39f419fccc Merge branch 'develop' 2022-01-29 18:10:35 +08:00
13621160019@163.com f977d2c1c4 added myems_carbon_db to recalculating script 2022-01-29 18:09:24 +08:00
13621160019@163.com e7a4453b8a added myems_carbon_db to recalculating script 2022-01-29 18:08:16 +08:00
13621160019@163.com d9c88d95d2 Merge branch 'develop' 2022-01-28 19:23:31 +08:00
13621160019@163.com 225dd53330 udpated version number to v1.7.0 2022-01-28 19:14:19 +08:00
13621160019@163.com a2660aa6e6 Merge branch 'develop' 2022-01-28 18:32:10 +08:00
13621160019@163.com 6026fc3d8c fixed isssues in README 2022-01-28 18:26:03 +08:00
13621160019@163.com 35cad1a811 fixed isssues in README 2022-01-28 18:23:14 +08:00
13621160019@163.com 11b4902661 Merge branch 'develop' 2022-01-28 13:56:23 +08:00
13621160019@163.com 5db7e8d4e5 added offline meter carbon dioxide emission aggregation procedure 2022-01-28 13:54:34 +08:00
13621160019@163.com 145d80cf38 Merge branch 'develop' 2022-01-28 13:44:47 +08:00
13621160019@163.com 0b7beecfb8 added virtual meter carbon dioxide emssion aggregation procedure 2022-01-28 13:42:45 +08:00
13621160019@163.com a1e60ab9f8 Merge branch 'develop' 2022-01-27 22:49:49 +08:00
13621160019@163.com efd73d962d added virtual meter carbon dioxide emssion aggregation procedure 2022-01-27 22:47:01 +08:00
13621160019@163.com a93dbe2d1b Merge branch 'develop' 2022-01-26 18:21:58 +08:00
13621160019@163.com 577f937fc5 updated example.env of myems-api 2022-01-26 18:19:46 +08:00
13621160019@163.com f00908f0b1 fixed issue of carbon_dioxide_emmision_factor in aggregation serivce 2022-01-26 17:37:06 +08:00
13621160019@163.com a544b58d5f Merge branch 'develop' 2022-01-26 16:10:22 +08:00
13621160019@163.com 281575a423 fixed issue of config in aggregation service 2022-01-26 16:08:52 +08:00
13621160019@163.com 4f68675c3e Merge branch 'develop' 2022-01-25 22:45:39 +08:00
13621160019@163.com 912fd5b613 added meter carbon dioxide emission aggregation procedure 2022-01-25 22:40:57 +08:00
13621160019@163.com da93a43819 Merge branch 'develop' 2022-01-24 22:15:21 +08:00
13621160019@163.com 0fb1cba06a added meter carbon dioxide emission report to api 2022-01-24 22:09:07 +08:00
13621160019@163.com 07ae3eb9ea Merge branch 'PR' into develop 2022-01-24 21:42:15 +08:00
13621160019@163.com 24a0677c40 added meter carbon dioxide emission report 2022-01-24 21:41:40 +08:00
13621160019@163.com 3d016243c6 Merge branch 'develop' 2022-01-24 13:41:22 +08:00
13621160019@163.com 2d66802fa0 updated components images in docs 2022-01-24 13:39:28 +08:00
13621160019@163.com 9984b30d0f Merge branch 'develop' 2022-01-24 11:43:58 +08:00
13621160019@163.com 563c5e9e7e updated architecture images in README 2022-01-24 11:33:06 +08:00
tianlinzhong 6e93bbd791 Added the interface of carbon emission analysis report of meter 2 2022-01-23 19:24:01 +08:00
13621160019@163.com 00263969a3 Merge branch 'develop' 2022-01-21 21:10:56 +08:00
13621160019@163.com 042e6f8dde fixed select statements issue in tenant reports 2022-01-21 21:07:53 +08:00
13621160019@163.com aa3e8fca25 Merge branch 'develop' 2022-01-21 20:38:34 +08:00
13621160019@163.com be6e74f08b fixed fraction numerator and denominator issue in combinedequipmentefficiency and equipmentefficiency reports 2022-01-21 20:36:35 +08:00
13621160019@163.com 63c214ccec Merge branch 'develop' 2022-01-21 19:11:59 +08:00
13621160019@163.com a49332e088 Merge branch 'PR' into develop 2022-01-21 19:09:47 +08:00
13621160019@163.com 1c724816bb added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant 2022-01-21 19:09:35 +08:00
tianlinzhong 0d9b67f93c Added the interface of carbon emission analysis report of meter 2022-01-20 13:13:07 +08:00
Caozhenhui 98385b8900 added alternative parameter uuid 2022-01-19 16:49:12 +08:00
13621160019@163.com eb6bd078dd Merge branch 'master' into develop 2022-01-19 09:41:42 +08:00
13621160019@163.com 910afa03c9 added new datbase myesm_carbon_db 2022-01-19 09:41:27 +08:00
13621160019@163.com ff0105ab27 Merge branch 'develop' 2022-01-19 09:14:45 +08:00
13621160019@163.com 7a82202e44 updated README 2022-01-19 08:17:13 +08:00
13621160019@163.com e2526d2677 Merge branch 'develop' 2022-01-18 22:57:04 +08:00
13621160019@163.com 7f26b63aac upgraded version number to 1.6.1 2022-01-18 22:55:31 +08:00
13621160019@163.com fb64d8017f Merge branch 'develop' 2022-01-18 22:04:29 +08:00
13621160019@163.com 64b53ac6e0 added meteruuid as alternative parameter to meter reports 2022-01-18 21:36:11 +08:00
13621160019@163.com b8ddb9a060 Merge branch 'PR' into develop 2022-01-18 21:07:25 +08:00
Caozhenhui f3d70cf5fb added alternative parameter meter_uuid 2022-01-18 12:55:34 +08:00