seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,940 Commits
2 Branches
32 Tags
112 MiB
Commit Graph

174 Commits (db1b32b4f9b9f2f00f57e3daace2043bccd4f42f)

Author SHA1 Message Date
13621160019@163.com f3cda07639 added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API 
Merge branch 'PR76' into develop
 2021-10-28 21:53:41 +08:00
13621160019@163.com 5f285d7939 updated commments in aggregate_hourly_data_by_period of API 2021-10-28 21:53:24 +08:00
13621160019@163.com 8353ca2b88 updated myems-api installation 2021-10-28 12:23:27 +08:00
Caozhenhui 0c1a2d9ab8 Modified comments 2021-10-27 10:05:35 +08:00
Caozhenhui fedcb71d3f Modified comments 2021-10-27 09:54:59 +08:00
Caozhenhui 21901667cb simplified code 2021-10-27 09:51:34 +08:00
Caozhenhui 88eb2dfc07 simplified code 2021-10-27 09:29:33 +08:00
Caozhenhui 7f212e209d Added the time scale of weekly to meterenergy 2021-10-26 19:35:10 +08:00
13621160019@163.com 32256396ac added validation for area of shopfloor, space, store and tenant in API 2021-10-19 18:45:17 +08:00
13621160019@163.com b29d8d1e9b removed gsmmodem and aliyun sms api from API & Admin UI 2021-09-22 22:42:37 +08:00
13621160019@163.com 02caabc640 changed start&end datetime formater for tariff from timestamp to strftime 2021-09-22 18:09:13 +08:00
13621160019@163.com efda021649 changed lease start&end datetime formater for tenant from timestamp to strftime 2021-09-22 16:07:38 +08:00
13621160019@163.com dec9bc6e87 changed last run datetime and next run datetime formater for rule from timestamp to strftime 2021-09-22 15:44:28 +08:00
13621160019@163.com 15ca471b83 changed last seen datetime formater for gateway from timestamp to strftime 2021-09-22 15:25:30 +08:00
13621160019@163.com 9624b75414 changed last seen datetime formater of datasource from timestamp to strftime 2021-09-22 14:50:41 +08:00
13621160019@163.com f27b95adee changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime; 2021-09-22 13:55:50 +08:00
13621160019@163.com 6962c65aab changed cost file upload datetime formatter from timestamp to strftime 2021-09-22 12:41:12 +08:00
13621160019@163.com 0ac76ccd96 added expiration datetimes to User in Admin UI 2021-09-22 11:28:33 +08:00
13621160019@163.com 01b6dabb31 added expiration datetimes to user actions in API 2021-09-21 16:03:39 +08:00
13621160019@163.com b25559414d added new protocols of datasource into API 2021-09-14 15:30:47 +08:00
13621160019@163.com 982b71f1a4 added new datasource protocols to API 2021-09-14 11:10:18 +08:00
13621160019@163.com 447eb57202 added aliyunsmsapi to api/core 2021-09-12 22:50:36 +08:00
13621160019@163.com f24deea941 modified API error message for knowledge file cannot be removed from disk 2021-09-06 15:01:24 +08:00
13621160019@163.com 4243ad043e removed cookies usages from API 2021-09-06 11:52:47 +08:00
13621160019@163.com 928ee6535e updated userlogger in API to pass HTTPError to client 2021-09-04 15:41:06 +08:00
13621160019@163.com 6c90203d51 added user log to UserLogin, ChangePassword and ResetPassword in API 2021-08-28 11:26:26 +08:00
13621160019@163.com ee056857d5 fixed typos in API 2021-08-27 18:50:08 +08:00
13621160019@163.com c00b252de6 fixed typo in userlogger of API 2021-08-27 18:29:25 +08:00
13621160019@163.com 457efdbf9c removed user_logger decorators from some actions in API 2021-08-27 18:19:17 +08:00
13621160019@163.com 6a5c8bd3cf added user_logger decorators to all on_put, on_post and on_delete actions in API 2021-08-27 18:09:47 +08:00
13621160019@163.com 9b5b9a38d7 updated userlogger in API 2021-08-27 17:21:01 +08:00
hyh123a 0f637e8a4b Merge branch 'develop' into logs 2021-08-25 15:24:08 +08:00
hyh123a 3565d0dbcc add the log function and test in equipments 2021-08-25 15:13:34 +08:00
13621160019@163.com b389887b50 fixed PEP8 warnings in API 2021-08-25 12:01:14 +08:00
13621160019@163.com f39ad7f039 fixed code style warnings in API 2021-08-25 10:15:27 +08:00
13621160019@163.com 7766723f60 changed user token hash algorithm from sha1 to sha256 in API 2021-08-23 15:38:49 +08:00
13621160019@163.com 17dfe5d687 removed unused local variable in costfile.py of API 2021-08-15 13:56:44 +08:00
13621160019@163.com 06b2892e84 fixed response body Restore actions 2021-08-14 17:24:35 +08:00
13621160019@163.com c0e363c87d updated Admin UI translations for Error Messages of API 2021-08-10 16:41:01 +08:00
13621160019@163.com cb8cf6a424 fixed typo in API 2021-08-10 11:28:43 +08:00
13621160019@163.com 4e11c36877 updated Menu API 2021-08-02 11:30:55 +08:00
13621160019@163.com 39452605cd fixed issue in Menu API 2021-08-02 11:10:53 +08:00
13621160019@163.com 2c0de0f673 updated Menu Setting in Admin UI 2021-08-02 10:52:13 +08:00
13621160019@163.com efd239be06 added Menu Setting to Admin UI 2021-08-01 20:43:24 +08:00
hyh123a 95c1dcca63 fixed the bug and add the notes 2021-07-30 18:58:05 +08:00
hyh123a 9bc743f7c9 fixed the bug for menu 2021-07-30 15:14:49 +08:00
hyh123a 8611c8d799 add the menu api 2021-07-30 15:08:20 +08:00
13621160019@163.com abb45dadbc added Cost File to API and Admin UI and upgraded to v1.1.4 2021-07-19 19:48:00 +08:00
13621160019@163.com 44403742a5 added restore button to offline meter file in API and Admin UI 2021-07-19 16:20:37 +08:00
13621160019@163.com 9443eca6f0 added Offline Cost File actions to API 2021-07-16 20:10:49 +08:00
13621160019@163.com 9f6fa02de0 fixed wrong HTTP Status Code issues in API 2021-07-07 14:06:19 +08:00
13621160019@163.com afc3ea98b4 added new category to FDD rule in API & Admin UI 2021-06-17 16:06:18 +08:00
13621160019@163.com 1bee235c6d validate expression of rule in API 2021-06-11 17:09:36 +08:00
13621160019@163.com 043dacfe24 changed GET Data Source Point Collection to order by ID 2021-06-01 14:31:08 +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
13621160019@163.com 95983aaf4e implemented virtual point calculating in myems-normalization service 2021-05-08 13:37:17 +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 1619849c16 added last seen datetime to data source setting in Admin UI 2021-04-28 15:55:10 +08:00
13621160019@163.com e4b9cffd18 added last seen datetime to Gateway Setting in Admin UI 2021-04-28 15:02:56 +08:00
13621160019@163.com a367bfc140 updated changelog and set version number to 1.1.2 2021-04-23 11:28:14 +08:00
13621160019@163.com 8b1ead660f added parameters validator to statistics_hourly_data_by_period in API 2021-04-12 15:09:00 +08:00
13621160019@163.com 985ffb55aa added code to validate parameters of averaging_hourly_data_by_period in API 2021-04-12 14:46:10 +08:00
13621160019@163.com e76066b62a upgraded version to v1.1.1 2021-03-31 15:49:23 +08:00
13621160019@163.com 398f96d4bd fixed error of None Comparision in API 2021-03-25 12:15:20 +08:00
13621160019@163.com cee412557a moved category before fdd_code of rule in admin UI and API 2021-03-23 10:51:34 +08:00
13621160019@163.com 5ab0f47c96 added last_run_datetime and next_run_datetime to rule in API 2021-03-22 17:29:40 +08:00
13621160019@163.com c08db755f4 updated version to v1.1.0 2021-03-18 11:47:46 +08:00
13621160019@163.com 82479e8b18 fixed issue when deleting offline meter file 2021-03-16 12:07:10 +08:00
13621160019@163.com 45414659df updated user login session expire time to 8 hours 2021-03-16 12:05:43 +08:00
13621160019@163.com 57b6dd3266 changed to set contact of space is optional in web UI and API 2021-03-15 13:46:16 +08:00
13621160019@163.com 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
13621160019@163.com 38d98a5ca1 updated change log and version number 2021-03-07 15:29:57 +08:00
13621160019@163.com 5736a6eac0 discard change of tbl_energy_flow_diagrams_links 2021-02-28 12:10:36 +08:00
13621160019@163.com e940d827a1 merged myems-api 2021-02-26 15:07:38 +08:00