seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/100/head
13621160019@163.com 2021-12-16 22:25:27 +08:00
parent 99bc30040a 33e6c24e28
commit 58d18cf476
9 changed files with 642 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
admin/app/controllers/users/user/user.controller.js
View File

@ -186,6 +186,41 @@ app.controller('UserController', function ($scope,
}); });
}; };
$scope.unlockUser = function (user){
SweetAlert.swal({
title: $translate.instant("SWEET.UNLOCK_TITLE"),
type: "warning",
showCancelButton: true,
confirmButtonColor: "#DD6B55",
confirmButtonText: $translate.instant("SWEET.UNLOCK_CONFIRM_BUTTON_TEXT"),
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
closeOnConfirm: true,
closeOnCancel: true
},function (isConfirm) {
if (isConfirm) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
UserService.unlockUser(user, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
body: $translate.instant("TOASTER.SUCCESS_UNLOCK_BODY", { template: $translate.instant("SETTING.USER") }),
showCloseButton: true,
});
$scope.getAllUsers();
} else {
toaster.pop({
type: "error",
title: $translate.instant("TOASTER.ERROR_UNLOCK_BODY", { template: $translate.instant("SETTING.USER") }),
body: $translate.instant(response.data.description),
showCloseButton: true,
});
}
});
}
});
};
$scope.getAllUsers(); $scope.getAllUsers();
$scope.getAllPrivileges(); $scope.getAllPrivileges();

8
admin/app/services/users/user/user.service.js
View File

@ -64,6 +64,14 @@ app.factory('UserService', function($http) {
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
},
unlockUser: function(user, headers, callback){
$http.put(getAPI()+'users/unlock/'+ user.id, {user}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
} }
}; };
}); });

5
admin/app/translations.js
View File

@ -1107,6 +1107,7 @@ function config($translateProvider) {
BIND_PROPERTY: '绑定属性', BIND_PROPERTY: '绑定属性',
EDIT: '修改', EDIT: '修改',
DELETE: '删除', DELETE: '删除',
UNLOCK: '解锁',
SELECT: '选择', SELECT: '选择',
RESET: '重置', RESET: '重置',
SAVE: '保存', SAVE: '保存',
@ -1544,9 +1545,11 @@ function config($translateProvider) {
SUCCESS_ADD_BODY: '添加 {{template}} 成功', SUCCESS_ADD_BODY: '添加 {{template}} 成功',
SUCCESS_UPDATE_BODY: '更新 {{template}} 成功', SUCCESS_UPDATE_BODY: '更新 {{template}} 成功',
SUCCESS_DELETE_BODY: '删除 {{template}} 成功', SUCCESS_DELETE_BODY: '删除 {{template}} 成功',
SUCCESS_UNLOCK_BODY: '解锁 {{template}} 成功',
ERROR_ADD_BODY: '添加 {{template}} 失败', ERROR_ADD_BODY: '添加 {{template}} 失败',
ERROR_UPDATE_BODY: '更新 {{template}} 失败', ERROR_UPDATE_BODY: '更新 {{template}} 失败',
ERROR_DELETE_BODY: '删除 {{template}} 失败', ERROR_DELETE_BODY: '删除 {{template}} 失败',
ERROR_UNLOCK_BODY: '解锁 {{template}} 失败',
USER_PASSWORD: '用户密码', USER_PASSWORD: '用户密码',
BIND_METER_SUCCESS: '绑定计量表成功', BIND_METER_SUCCESS: '绑定计量表成功',
@ -1573,6 +1576,8 @@ function config($translateProvider) {
TEXT: '删除该条也会删除所有与其相关数据!', TEXT: '删除该条也会删除所有与其相关数据!',
CONFIRM_BUTTON_TEXT: '确认删除', CONFIRM_BUTTON_TEXT: '确认删除',
CANCEL_BUTTON_TEXT: '取消', CANCEL_BUTTON_TEXT: '取消',
UNLOCK_TITLE: '请确认是否解锁该用户登录权限',
UNLOCK_CONFIRM_BUTTON_TEXT: '确认解锁'
}, },
API: { API: {
ADMINISTRATOR_SESSION_NOT_FOUND: 'Administrator Session Not Found', ADMINISTRATOR_SESSION_NOT_FOUND: 'Administrator Session Not Found',

1
admin/views/users/user/user.html
View File

@ -36,6 +36,7 @@
<a class="btn btn-primary btn-rounded btn-xs" ng-click="editUser(user)" >{{'SETTING.EDIT' | translate}}</a> <a class="btn btn-primary btn-rounded btn-xs" ng-click="editUser(user)" >{{'SETTING.EDIT' | translate}}</a>
<a ng-hide="user.name=='administrator'" class="btn btn-info btn-rounded btn-xs" ng-click="resetPassword(user)" >{{'USER.RESET_PASSWORD' | translate}}</a> <a ng-hide="user.name=='administrator'" class="btn btn-info btn-rounded btn-xs" ng-click="resetPassword(user)" >{{'USER.RESET_PASSWORD' | translate}}</a>
<a ng-hide="user.name=='administrator'" ng-click="deleteUser(user)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a> <a ng-hide="user.name=='administrator'" ng-click="deleteUser(user)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.DELETE' | translate}}</a>
<a ng-hide="user.failed_login_count < 3" ng-click="unlockUser(user)" class="btn btn-danger btn-rounded btn-xs" >{{'SETTING.UNLOCK' | translate}}</a>
</td> </td>
</tr> </tr>
</tbody> </tbody>

481
myems-api/MyEMS.postman_collection.json
View File

@ -4577,7 +4577,19 @@
"name": "POST Create New Offline Meter", "name": "POST Create New Offline Meter",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"name\":\"OfflinePM21\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"空调用电\"}}" "raw": "{\"data\":{\"name\":\"OfflinePM21\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"空调用电\"}}"
@ -4598,19 +4610,31 @@
"name": "PUT Update a Offline Meter", "name": "PUT Update a Offline Meter",
"request": { "request": {
"method": "PUT", "method": "PUT",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"name\":\"OfflinePM201\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"空调用电\"}}" "raw": "{\"data\":{\"name\":\"OfflinePM201\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"空调用电\"}}"
}, },
"url": { "url": {
"raw": "{{base_url}}/offlinemeters/6", "raw": "{{base_url}}/offlinemeters/3",
"host": [ "host": [
"{{base_url}}" "{{base_url}}"
], ],
"path": [ "path": [
"offlinemeters", "offlinemeters",
"6" "3"
] ]
} }
}, },
@ -4620,15 +4644,27 @@
"name": "DELETE Offline Meter by ID", "name": "DELETE Offline Meter by ID",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/offlinemeters/2", "raw": "{{base_url}}/offlinemeters/3",
"host": [ "host": [
"{{base_url}}" "{{base_url}}"
], ],
"path": [ "path": [
"offlinemeters", "offlinemeters",
"2" "3"
] ]
} }
}, },
@ -5161,7 +5197,8 @@
{ {
"key": "User-UUID", "key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text" "type": "text",
"description": "Any Admin User's UUID"
}, },
{ {
"key": "Token", "key": "Token",
@ -5193,7 +5230,8 @@
{ {
"key": "User-UUID", "key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text" "type": "text",
"description": "Any Admin User's UUID"
}, },
{ {
"key": "Token", "key": "Token",
@ -5226,7 +5264,8 @@
{ {
"key": "User-UUID", "key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text" "type": "text",
"description": "Any Admin User's UUID"
}, },
{ {
"key": "Token", "key": "Token",
@ -6157,7 +6196,19 @@
"name": "POST Create New Space", "name": "POST Create New Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMSSpace\", \"parent_space_id\":1, \"area\":999.99, \"timezone_id\":56, \"is_input_counted\":true, \"is_output_counted\":false, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Space description\"}}" "raw": "{\"data\":{\"name\":\"MyEMSSpace\", \"parent_space_id\":1, \"area\":999.99, \"timezone_id\":56, \"is_input_counted\":true, \"is_output_counted\":false, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Space description\"}}"
@ -6178,7 +6229,19 @@
"name": "PUT Update a Space", "name": "PUT Update a Space",
"request": { "request": {
"method": "PUT", "method": "PUT",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMSSpace\", \"parent_space_id\":2, \"area\":999.99, \"timezone_id\":56, \"is_input_counted\":true, \"is_output_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Space description\"}}" "raw": "{\"data\":{\"name\":\"MyEMSSpace\", \"parent_space_id\":2, \"area\":999.99, \"timezone_id\":56, \"is_input_counted\":true, \"is_output_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Space description\"}}"
@ -6200,7 +6263,19 @@
"name": "DELETE a Space by ID", "name": "DELETE a Space by ID",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/57", "raw": "{{base_url}}/spaces/57",
"host": [ "host": [
@ -6256,7 +6331,19 @@
"name": "POST Bind a Combined Equipment to a Space", "name": "POST Bind a Combined Equipment to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"combined_equipment_id\":1}}" "raw": "{\"data\":{\"combined_equipment_id\":1}}"
@ -6279,7 +6366,19 @@
"name": "DELETE a Combined Equipment from Space", "name": "DELETE a Combined Equipment from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/combinedequipments/1", "raw": "{{base_url}}/spaces/1/combinedequipments/1",
"host": [ "host": [
@ -6318,7 +6417,19 @@
"name": "POST Bind an Equipment to a Space", "name": "POST Bind an Equipment to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"equipment_id\":1}}" "raw": "{\"data\":{\"equipment_id\":1}}"
@ -6341,7 +6452,19 @@
"name": "DELETE an Equipment from Space", "name": "DELETE an Equipment from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/equipments/1", "raw": "{{base_url}}/spaces/1/equipments/1",
"host": [ "host": [
@ -6380,7 +6503,18 @@
"name": "POST Bind a Meter to a Space", "name": "POST Bind a Meter to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"meter_id\":1}}" "raw": "{\"data\":{\"meter_id\":1}}"
@ -6400,10 +6534,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Meter from Space", "name": "DELETE Unbind a Meter from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/meters/1", "raw": "{{base_url}}/spaces/1/meters/1",
"host": [ "host": [
@ -6442,7 +6588,19 @@
"name": "POST Bind an OfflineMeter to a Space", "name": "POST Bind an OfflineMeter to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"offline_meter_id\":1}}" "raw": "{\"data\":{\"offline_meter_id\":1}}"
@ -6462,10 +6620,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE an Offline Meter from Space", "name": "DELETE Unbind an Offline Meter from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/offlinemeters/1", "raw": "{{base_url}}/spaces/1/offlinemeters/1",
"host": [ "host": [
@ -6504,7 +6674,19 @@
"name": "POST Bind a Point to a Space", "name": "POST Bind a Point to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"point_id\":1}}" "raw": "{\"data\":{\"point_id\":1}}"
@ -6524,10 +6706,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Point from Space", "name": "DELETE Unbind a Point from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/points/3", "raw": "{{base_url}}/spaces/1/points/3",
"host": [ "host": [
@ -6566,7 +6760,19 @@
"name": "POST Bind a Sensor to a Space", "name": "POST Bind a Sensor to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"sensor_id\":1}}" "raw": "{\"data\":{\"sensor_id\":1}}"
@ -6586,10 +6792,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Sensor from Space", "name": "DELETE Unbind a Sensor from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/sensors/1", "raw": "{{base_url}}/spaces/1/sensors/1",
"host": [ "host": [
@ -6628,7 +6846,19 @@
"name": "POST Bind a Shopfloor to a Space", "name": "POST Bind a Shopfloor to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"shopfloor_id\":1}}" "raw": "{\"data\":{\"shopfloor_id\":1}}"
@ -6648,10 +6878,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Shopfloor from a Space", "name": "DELETE Unbind a Shopfloor from a Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/shopfloors/1", "raw": "{{base_url}}/spaces/1/shopfloors/1",
"host": [ "host": [
@ -6690,7 +6932,19 @@
"name": "POST Bind a Store to a Space", "name": "POST Bind a Store to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"store_id\":1}}" "raw": "{\"data\":{\"store_id\":1}}"
@ -6710,10 +6964,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Store from Space", "name": "DELETE Unbind a Store from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/stores/1", "raw": "{{base_url}}/spaces/1/stores/1",
"host": [ "host": [
@ -6752,7 +7018,19 @@
"name": "POST Bind a Tenant to a Space", "name": "POST Bind a Tenant to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"tenant_id\":1}}" "raw": "{\"data\":{\"tenant_id\":1}}"
@ -6772,10 +7050,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Tenant from Space", "name": "DELETE Unbind a Tenant from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/tenants/1", "raw": "{{base_url}}/spaces/1/tenants/1",
"host": [ "host": [
@ -6814,7 +7104,19 @@
"name": "POST Bind a Virtual Meter to a Space", "name": "POST Bind a Virtual Meter to a Space",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"virtual_meter_id\":1}}" "raw": "{\"data\":{\"virtual_meter_id\":1}}"
@ -6834,10 +7136,22 @@
"response": [] "response": []
}, },
{ {
"name": "DELETE a Virtual Meter from Space", "name": "DELETE Unbind a Virtual Meter from Space",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/spaces/1/virtualmeters/1", "raw": "{{base_url}}/spaces/1/virtualmeters/1",
"host": [ "host": [
@ -6861,11 +7175,12 @@
{ {
"key": "User-UUID", "key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text" "type": "text",
"description": "Any User's UUID"
}, },
{ {
"key": "Token", "key": "Token",
"value": "e1879592cb12e4cbf0e1762ed42edde699499cd9", "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text" "type": "text"
} }
], ],
@ -8721,7 +9036,7 @@
}, },
{ {
"key": "Token", "key": "Token",
"value": "50bc979c9181699bc33927aa04a453fd83e2b8e8280544bfc3807fdedf2645201676fe474787e0ea3024502659a2ab4b1905c6ca4f444ffdba764a603c4eb691", "value": "6c32302cb46cae4236fe9d04ccb21f950bce593267f33dc169e700bb98ea5c3446521251a1b4078ebcbe51b4ca4ba59ac01b395e0f69ef42fa0bc36d6bd5683c",
"description": "Login to get a valid token", "description": "Login to get a valid token",
"type": "text" "type": "text"
} }
@ -9030,6 +9345,38 @@
} }
}, },
"response": [] "response": []
},
{
"name": "PUT Unlock User",
"request": {
"method": "PUT",
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any admin users' UUID"
},
{
"key": "Token",
"value": "6c32302cb46cae4236fe9d04ccb21f950bce593267f33dc169e700bb98ea5c3446521251a1b4078ebcbe51b4ca4ba59ac01b395e0f69ef42fa0bc36d6bd5683c",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/users/unlock/2",
"host": [
"{{base_url}}"
],
"path": [
"users",
"unlock",
"2"
]
}
},
"response": []
} }
] ]
}, },
@ -9075,10 +9422,22 @@
"name": "POST Create New Virtual Meter", "name": "POST Create New Virtual Meter",
"request": { "request": {
"method": "POST", "method": "POST",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"name\":\"VM10\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1+x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":3},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":4},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":5}] } }}" "raw": "{\"data\":{\"name\":\"VM10\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1+x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":1},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":2},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":3}] } }}"
}, },
"url": { "url": {
"raw": "{{base_url}}/virtualmeters", "raw": "{{base_url}}/virtualmeters",
@ -9096,10 +9455,22 @@
"name": "PUT Update a Virtual Meter by ID", "name": "PUT Update a Virtual Meter by ID",
"request": { "request": {
"method": "PUT", "method": "PUT",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"body": { "body": {
"mode": "raw", "mode": "raw",
"raw": "{\"data\":{\"name\":\"VM51\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1-x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":3},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":4},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":5}] } }}" "raw": "{\"data\":{\"name\":\"VM11\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1+x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":1},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":2},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":3}] } }}"
}, },
"url": { "url": {
"raw": "{{base_url}}/virtualmeters/3", "raw": "{{base_url}}/virtualmeters/3",
@ -9118,7 +9489,19 @@
"name": "DELETE a Virtual Meter by ID", "name": "DELETE a Virtual Meter by ID",
"request": { "request": {
"method": "DELETE", "method": "DELETE",
"header": [], "header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
"type": "text",
"description": "Any Admin User's UUID"
},
{
"key": "Token",
"value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55",
"type": "text"
}
],
"url": { "url": {
"raw": "{{base_url}}/virtualmeters/3", "raw": "{{base_url}}/virtualmeters/3",
"host": [ "host": [

8
myems-api/README.md
View File

@ -1981,11 +1981,11 @@ curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKE
### User ### User
* GET All Users * GET All Users
```bash ```bash
curl -i -X GET {{base_url}}/users curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/users
``` ```
* GET a User by ID * GET a User by ID
```bash ```bash
curl -i -X GET {{base_url}}/users/{id} curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/users/{id}
``` ```
* DELETE User by id * DELETE User by id
```bash ```bash
@ -2019,6 +2019,10 @@ curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKE
```bash ```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword
``` ```
* PUT User Unlock
```bash
curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT {{base_url}}/users/unlock/{id}
```
### Virtual Meter ### Virtual Meter
* GET a Virtual Meter by ID * GET a Virtual Meter by ID

2
myems-api/app.py
View File

@ -464,6 +464,8 @@ api.add_route('/users/resetpassword',
user.ResetPassword()) user.ResetPassword())
api.add_route('/users/changepassword', api.add_route('/users/changepassword',
user.ChangePassword()) user.ChangePassword())
api.add_route('/users/unlock/{id_}',
user.Unlock())
api.add_route('/virtualmeters', api.add_route('/virtualmeters',
virtualmeter.VirtualMeterCollection()) virtualmeter.VirtualMeterCollection())

163
myems-api/config.py
View File

@ -1,154 +1,97 @@
from decouple import config from decouple import config
MYEMS_SYSTEM_DB_HOST = config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1')
MYEMS_SYSTEM_DB_PORT = config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int)
MYEMS_SYSTEM_DB_DATABASE = config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db')
MYEMS_SYSTEM_DB_USER = config('MYEMS_SYSTEM_DB_USER', default='root')
MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1')
MYEMS_ENERGY_DB_HOST = config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1')
MYEMS_ENERGY_DB_PORT = config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int)
MYEMS_ENERGY_DB_DATABASE = config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db')
MYEMS_ENERGY_DB_USER = config('MYEMS_ENERGY_DB_USER', default='root')
MYEMS_ENERGY_DB_PASSWORD = config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1')
MYEMS_ENERGY_BASELINE_DB_HOST = config('MYEMS_ENERGY_BASELINE_DB_HOST', default='127.0.0.1')
MYEMS_ENERGY_BASELINE_DB_PORT = config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int)
MYEMS_ENERGY_BASELINE_DB_DATABASE = config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db')
MYEMS_ENERGY_BASELINE_DB_USER = config('MYEMS_ENERGY_BASELINE_DB_USER', default='root')
MYEMS_ENERGY_BASELINE_DB_PASSWORD = config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1')
MYEMS_BILLING_DB_HOST = config('MYEMS_BILLING_DB_HOST', default='127.0.0.1')
MYEMS_BILLING_DB_PORT = config('MYEMS_BILLING_DB_PORT', default=3306, cast=int)
MYEMS_BILLING_DB_DATABASE = config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db')
MYEMS_BILLING_DB_USER = config('MYEMS_BILLING_DB_USER', default='root')
MYEMS_BILLING_DB_PASSWORD = config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1')
MYEMS_BILLING_BASELINE_DB_HOST = config('MYEMS_BILLING_BASELINE_DB_HOST', default='127.0.0.1')
MYEMS_BILLING_BASELINE_DB_PORT = config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int)
MYEMS_BILLING_BASELINE_DB_DATABASE = config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db')
MYEMS_BILLING_BASELINE_DB_USER = config('MYEMS_BILLING_BASELINE_DB_USER', default='root')
MYEMS_BILLING_BASELINE_DB_PASSWORD = config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1')
MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1')
MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int)
MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db')
MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root')
MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1')
MYEMS_USER_DB_HOST = config('MYEMS_USER_DB_HOST', default='127.0.0.1')
MYEMS_USER_DB_PORT = config('MYEMS_USER_DB_PORT', default=3306, cast=int)
MYEMS_USER_DB_DATABASE = config('MYEMS_USER_DB_DATABASE', default='myems_user_db')
MYEMS_USER_DB_USER = config('MYEMS_USER_DB_USER', default='root')
MYEMS_USER_DB_PASSWORD = config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1')
MYEMS_FDD_DB_HOST = config('MYEMS_FDD_DB_HOST', default='127.0.0.1')
MYEMS_FDD_DB_PORT = config('MYEMS_FDD_DB_PORT', default=3306, cast=int)
MYEMS_FDD_DB_DATABASE = config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db')
MYEMS_FDD_DB_USER = config('MYEMS_FDD_DB_USER', default='root')
MYEMS_FDD_DB_PASSWORD = config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1')
MYEMS_REPORTING_DB_HOST = config('MYEMS_REPORTING_DB_HOST', default='127.0.0.1')
MYEMS_REPORTING_DB_PORT = config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int)
MYEMS_REPORTING_DB_DATABASE = config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db')
MYEMS_REPORTING_DB_USER = config('MYEMS_REPORTING_DB_USER', default='root')
MYEMS_REPORTING_DB_PASSWORD = config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1')
MINUTES_TO_COUNT = config('MINUTES_TO_COUNT', default=60, cast=int)
UTC_OFFSET = config('UTC_OFFSET', default='+08:00')
WORKING_DAY_START_TIME_LOCAL = config('WORKING_DAY_START_TIME_LOCAL', default='00:00:00')
UPLOAD_PATH = config('UPLOAD_PATH', default='/var/www/html/admin/upload/')
CURRENCY_UNIT = config('CURRENCY_UNIT', default='CNY')
myems_system_db = { myems_system_db = {
'host': MYEMS_SYSTEM_DB_HOST, 'host': config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1'),
'port': MYEMS_SYSTEM_DB_PORT, 'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int),
'database': MYEMS_SYSTEM_DB_DATABASE, 'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'),
'user': MYEMS_SYSTEM_DB_USER, 'user': config('MYEMS_SYSTEM_DB_USER', default='root'),
'password': MYEMS_SYSTEM_DB_PASSWORD, 'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'),
} }
myems_energy_db = { myems_energy_db = {
'host': MYEMS_ENERGY_DB_HOST, 'host': config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1'),
'port': MYEMS_ENERGY_DB_PORT, 'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int),
'database': MYEMS_ENERGY_DB_DATABASE, 'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'),
'user': MYEMS_ENERGY_DB_USER, 'user': config('MYEMS_ENERGY_DB_USER', default='root'),
'password': MYEMS_ENERGY_DB_PASSWORD, 'password': config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1'),
} }
myems_energy_baseline_db = { myems_energy_baseline_db = {
'host': MYEMS_ENERGY_BASELINE_DB_HOST, 'host': config('MYEMS_ENERGY_BASELINE_DB_HOST', default='127.0.0.1'),
'port': MYEMS_ENERGY_BASELINE_DB_PORT, 'port': config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int),
'database': MYEMS_ENERGY_BASELINE_DB_DATABASE, 'database': config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db'),
'user': MYEMS_ENERGY_BASELINE_DB_USER, 'user': config('MYEMS_ENERGY_BASELINE_DB_USER', default='root'),
'password': MYEMS_ENERGY_BASELINE_DB_PASSWORD, 'password': config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1'),
} }
myems_billing_db = { myems_billing_db = {
'host': MYEMS_BILLING_DB_HOST, 'host': config('MYEMS_BILLING_DB_HOST', default='127.0.0.1'),
'port': MYEMS_BILLING_DB_PORT, 'port': config('MYEMS_BILLING_DB_PORT', default=3306, cast=int),
'database': MYEMS_BILLING_DB_DATABASE, 'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db'),
'user': MYEMS_BILLING_DB_USER, 'user': config('MYEMS_BILLING_DB_USER', default='root'),
'password': MYEMS_BILLING_DB_PASSWORD, 'password': config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1'),
} }
myems_billing_baseline_db = { myems_billing_baseline_db = {
'host': MYEMS_BILLING_BASELINE_DB_HOST, 'host': config('MYEMS_BILLING_BASELINE_DB_HOST', default='127.0.0.1'),
'port': MYEMS_BILLING_BASELINE_DB_PORT, 'port': config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int),
'database': MYEMS_BILLING_BASELINE_DB_DATABASE, 'database': config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db'),
'user': MYEMS_BILLING_BASELINE_DB_USER, 'user': config('MYEMS_BILLING_BASELINE_DB_USER', default='root'),
'password': MYEMS_BILLING_BASELINE_DB_PASSWORD, 'password': config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1'),
} }
myems_historical_db = { myems_historical_db = {
'host': MYEMS_HISTORICAL_DB_HOST, 'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'),
'port': MYEMS_HISTORICAL_DB_PORT, 'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int),
'database': MYEMS_HISTORICAL_DB_DATABASE, 'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'),
'user': MYEMS_HISTORICAL_DB_USER, 'user': config('MYEMS_HISTORICAL_DB_USER', default='root'),
'password': MYEMS_HISTORICAL_DB_PASSWORD, 'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'),
} }
myems_user_db = { myems_user_db = {
'host': MYEMS_USER_DB_HOST, 'host': config('MYEMS_USER_DB_HOST', default='127.0.0.1'),
'port': MYEMS_USER_DB_PORT, 'port': config('MYEMS_USER_DB_PORT', default=3306, cast=int),
'database': MYEMS_USER_DB_DATABASE, 'database': config('MYEMS_USER_DB_DATABASE', default='myems_user_db'),
'user': MYEMS_USER_DB_USER, 'user': config('MYEMS_USER_DB_USER', default='root'),
'password': MYEMS_USER_DB_PASSWORD, 'password': config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1'),
} }
myems_fdd_db = { myems_fdd_db = {
'host': MYEMS_FDD_DB_HOST, 'host': config('MYEMS_FDD_DB_HOST', default='127.0.0.1'),
'port': MYEMS_FDD_DB_PORT, 'port': config('MYEMS_FDD_DB_PORT', default=3306, cast=int),
'database': MYEMS_FDD_DB_DATABASE, 'database': config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db'),
'user': MYEMS_FDD_DB_USER, 'user': config('MYEMS_FDD_DB_USER', default='root'),
'password': MYEMS_FDD_DB_PASSWORD, 'password': config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1'),
} }
myems_reporting_db = { myems_reporting_db = {
'host': MYEMS_REPORTING_DB_HOST, 'host': config('MYEMS_REPORTING_DB_HOST', default='127.0.0.1'),
'port': MYEMS_REPORTING_DB_PORT, 'port': config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int),
'database': MYEMS_REPORTING_DB_DATABASE, 'database': config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db'),
'user': MYEMS_REPORTING_DB_USER, 'user': config('MYEMS_REPORTING_DB_USER', default='root'),
'password': MYEMS_REPORTING_DB_PASSWORD, 'password': config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1'),
} }
# indicated in how many minutes to calculate meter energy consumption # indicated in how many minutes to calculate meter energy consumption
# 30 for half hourly period # 30 for half hourly period
# 60 for hourly period # 60 for hourly period
minutes_to_count = MINUTES_TO_COUNT minutes_to_count = config('MINUTES_TO_COUNT', default=60, cast=int)
# indicates the project's time zone offset from UTC # indicates the project's time zone offset from UTC
utc_offset = UTC_OFFSET utc_offset = config('UTC_OFFSET', default='+08:00')
# indicates from when ( in local timezone) of the day to calculate working days # indicates from when ( in local timezone) of the day to calculate working days
working_day_start_time_local = WORKING_DAY_START_TIME_LOCAL working_day_start_time_local = config('WORKING_DAY_START_TIME_LOCAL', default='00:00:00')
# indicates where user uploaded files will be saved to # indicates where user uploaded files will be saved to
# must use the root folder of myems-admin web application # must use the root folder of myems-admin web application
# for example if you serve myems-admin at /var/www/html/admin # for example if you serve myems-admin at /var/www/html/admin
# you should set the upload_path as below # you should set the upload_path as below
upload_path = UPLOAD_PATH upload_path = config('UPLOAD_PATH', default='/var/www/html/admin/upload/')
# main currency unit # main currency unit
currency_unit = CURRENCY_UNIT currency_unit = config('CURRENCY_UNIT', default='CNY')
# maximum failed login count, otherwise the user should be locked
maximum_failed_login_count = config('MAXIMUM_FAILED_LOGIN_COUNT', default=3, cast=int)

106
myems-api/core/user.py
View File

@ -27,7 +27,7 @@ class UserCollection:
cursor = cnx.cursor() cursor = cnx.cursor()
query = (" SELECT u.id, u.name, u.display_name, u.uuid, " query = (" SELECT u.id, u.name, u.display_name, u.uuid, "
" u.email, u.is_admin, p.id, p.name, " " u.email, u.is_admin, p.id, p.name, "
" u.account_expiration_datetime_utc, u.password_expiration_datetime_utc " " u.account_expiration_datetime_utc, u.password_expiration_datetime_utc, u.failed_login_count "
" FROM tbl_users u " " FROM tbl_users u "
" LEFT JOIN tbl_privileges p ON u.privilege_id = p.id " " LEFT JOIN tbl_privileges p ON u.privilege_id = p.id "
" ORDER BY u.name ") " ORDER BY u.name ")
@ -59,7 +59,8 @@ class UserCollection:
"account_expiration_datetime": "account_expiration_datetime":
account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
"password_expiration_datetime": "password_expiration_datetime":
password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')} password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'),
"failed_login_count": row[10]}
result.append(meta_result) result.append(meta_result)
resp.text = json.dumps(result) resp.text = json.dumps(result)
@ -444,7 +445,7 @@ class UserLogin:
description='API.INVALID_USER_NAME') description='API.INVALID_USER_NAME')
query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, " query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, "
" account_expiration_datetime_utc, password_expiration_datetime_utc " " account_expiration_datetime_utc, password_expiration_datetime_utc, failed_login_count "
" FROM tbl_users " " FROM tbl_users "
" WHERE name = %s ") " WHERE name = %s ")
cursor.execute(query, (str.strip(new_values['data']['name']).lower(),)) cursor.execute(query, (str.strip(new_values['data']['name']).lower(),))
@ -463,7 +464,8 @@ class UserLogin:
"password": row[6], "password": row[6],
"is_admin": True if row[7] else False, "is_admin": True if row[7] else False,
"account_expiration_datetime_utc": row[8], "account_expiration_datetime_utc": row[8],
"password_expiration_datetime_utc": row[9]} "password_expiration_datetime_utc": row[9],
"failed_login_count": row[10]}
elif 'email' in new_values['data']: elif 'email' in new_values['data']:
if not isinstance(new_values['data']['email'], str) or \ if not isinstance(new_values['data']['email'], str) or \
@ -472,7 +474,7 @@ class UserLogin:
description='API.INVALID_EMAIL') description='API.INVALID_EMAIL')
query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, " query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, "
" account_expiration_datetime_utc, password_expiration_datetime_utc " " account_expiration_datetime_utc, password_expiration_datetime_utc,failed_login_count "
" FROM tbl_users " " FROM tbl_users "
" WHERE email = %s ") " WHERE email = %s ")
cursor.execute(query, (str.strip(new_values['data']['email']).lower(),)) cursor.execute(query, (str.strip(new_values['data']['email']).lower(),))
@ -491,22 +493,45 @@ class UserLogin:
"password": row[6], "password": row[6],
"is_admin": True if row[7] else False, "is_admin": True if row[7] else False,
"account_expiration_datetime_utc": row[8], "account_expiration_datetime_utc": row[8],
"password_expiration_datetime_utc": row[9]} "password_expiration_datetime_utc": row[9],
"failed_login_count": row[10]}
else: else:
cursor.close() cursor.close()
cnx.disconnect() cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_USER_NAME_OR_EMAIL') description='API.INVALID_USER_NAME_OR_EMAIL')
failed_login_count = result['failed_login_count']
if failed_login_count >= config.maximum_failed_login_count:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_HAS_BEEN_LOCKED')
salt = result['salt'] salt = result['salt']
password = str.strip(new_values['data']['password']) password = str.strip(new_values['data']['password'])
hashed_password = hashlib.sha512(salt.encode() + password.encode()).hexdigest() hashed_password = hashlib.sha512(salt.encode() + password.encode()).hexdigest()
if hashed_password != result['password']: if hashed_password != result['password']:
update_failed_login_count = (" UPDATE tbl_users "
" SET failed_login_count = %s "
" WHERE uuid = %s ")
user_uuid = result['uuid']
cursor.execute(update_failed_login_count, (failed_login_count + 1, user_uuid))
cnx.commit()
cursor.close() cursor.close()
cnx.disconnect() cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_PASSWORD') raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_PASSWORD')
if failed_login_count != 0:
update_failed_login_count = (" UPDATE tbl_users "
" SET failed_login_count = 0 "
" WHERE uuid = %s ")
user_uuid = result['uuid']
cursor.execute(update_failed_login_count, (user_uuid, ))
cnx.commit()
if result['account_expiration_datetime_utc'] <= datetime.utcnow(): if result['account_expiration_datetime_utc'] <= datetime.utcnow():
cursor.close() cursor.close()
cnx.disconnect() cnx.disconnect()
@ -828,3 +853,72 @@ class ResetPassword:
resp.status = falcon.HTTP_200 resp.status = falcon.HTTP_200
write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='ResetPassword', write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='ResetPassword',
resource_id=user_id, request_body=None) resource_id=user_id, request_body=None)
class Unlock:
@staticmethod
def __init__():
"""Initializes Class"""
pass
@staticmethod
def on_options(req, resp):
resp.status = falcon.HTTP_200
@staticmethod
def on_put(req, resp, id_):
"""Handles PUT requests"""
if 'USER-UUID' not in req.headers or \
not isinstance(req.headers['USER-UUID'], str) or \
len(str.strip(req.headers['USER-UUID'])) == 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_USER_UUID')
admin_user_uuid = str.strip(req.headers['USER-UUID'])
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_USER_ID')
Id = id_
cnx = mysql.connector.connect(**config.myems_user_db)
cursor = cnx.cursor()
query = (" SELECT failed_login_count "
" FROM tbl_users "
" WHERE id = %s ")
cursor.execute(query, (Id,))
row = cursor.fetchone()
if row is None:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_Id')
failed_login_count = row[0]
if failed_login_count < config.maximum_failed_login_count:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_IS_NOT_LOCKED')
update_user = (" UPDATE tbl_users "
" SET failed_login_count = 0"
" WHERE id = %s ")
cursor.execute(update_user, (Id, ))
cnx.commit()
query = (" SELECT failed_login_count "
" FROM tbl_users "
" WHERE id = %s ")
cursor.execute(query, (Id,))
row = cursor.fetchone()
if row is None or row[0] != 0:
cursor.close()
cnx.disconnect()
raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.ACCOUNT_UNLOCK_FAILED')
cursor.close()
cnx.disconnect()
resp.text = json.dumps("OK")
resp.status = falcon.HTTP_200
write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='UnlockUser',
resource_id=Id, request_body=None)