From 57671aa2b6f2d6e2a688ab3c420e3e569310ff24 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 6 Dec 2021 19:31:51 +0800 Subject: [PATCH] added access control to combinedequipment in api and admin --- .../combinedequipment.controller.js | 10 +- .../combinedequipmentequipment.controller.js | 10 +- .../combinedequipmentmeter.controller.js | 14 +- .../combinedequipmentequipment.service.js | 2 +- .../combinedequipmentparameter.service.js | 5 +- myems-api/MyEMS.postman_collection.json | 356 +++++++++++++++--- 6 files changed, 330 insertions(+), 67 deletions(-) diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js index b0307c79..15cc7134 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('CombinedEquipmentController', function ($scope, $window, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) { +app.controller('CombinedEquipmentController', function ( + $scope, + $window, + $translate, + $uibModal, + CombinedEquipmentService, + CostCenterService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCombinedEquipments = function () { CombinedEquipmentService.getAllCombinedEquipments(function (response) { diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js index c083c51b..fb8a9ccb 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('CombinedEquipmentEquipmentController', function ($scope, $window, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentEquipmentController', function ( + $scope, + $window, + $translate, + CombinedEquipmentService, + EquipmentService, + CombinedEquipmentEquipmentService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = {selected:undefined}; diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js index 24d6d6de..b9ba9b39 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('CombinedEquipmentMeterController', function ($scope, $window, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentMeterController', function ( + $scope, + $window, + $timeout, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + CombinedEquipmentMeterService, + CombinedEquipmentService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = { selected: undefined }; diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js index 077da20c..085c2da5 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js @@ -2,7 +2,7 @@ app.factory('CombinedEquipmentEquipmentService', function($http) { return { addPair: function(combinedequipmentID,equipmentID, headers, callback) { - $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}} ,{headers}) + $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments', {data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js index 1fda1a24..6857677c 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js @@ -1,7 +1,6 @@ 'use strict'; app.factory('CombinedEquipmentParameterService', function($http) { return { - getParametersByCombinedEquipmentID: function(id, callback) { $http.get(getAPI()+'combinedequipments/'+id+'/parameters') .then(function (response) { @@ -19,8 +18,8 @@ app.factory('CombinedEquipmentParameterService', function($http) { }); }, editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter, headers, callback) { - $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter} - , {headers}) + $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id, + {data:combinedequipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 086eb3ba..d72b38b0 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -12,14 +12,10 @@ "name": "Combined Equipment", "item": [ { - "name": "POST Create New Combined Equipment", + "name": "GET All Combined Equipments", "request": { - "method": "POST", + "method": "GET", "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"name\":\"MyEMS Chiller Plant\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}" - }, "url": { "raw": "{{base_url}}/combinedequipments", "host": [ @@ -33,10 +29,27 @@ "response": [] }, { - "name": "GET All Combined Equipments", + "name": "POST Create New Combined Equipment", "request": { - "method": "GET", - "header": [], + "method": "POST", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], + "body": { + "mode": "raw", + "raw": "{\"data\":{\"name\":\"MyEMS Chiller Plant\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}" + }, "url": { "raw": "{{base_url}}/combinedequipments", "host": [ @@ -71,7 +84,20 @@ "name": "PUT Update a Combined Equipment by ID", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMS Combined Chiller Plant\", \"is_input_counted\":true, \"is_output_counted\":true, \"cost_center_id\":1, \"description\":\"equipment description\"}}" @@ -93,7 +119,20 @@ "name": "POST Clone a Combined Equipment by ID", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{}}" @@ -115,7 +154,20 @@ "name": "DELETE a Combined Equipment by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/6", "host": [ @@ -133,7 +185,20 @@ "name": "POST Bind an Equipment to a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"equipment_id\":1}}" @@ -175,7 +240,20 @@ "name": "DELETE an Equipment from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/equipments/1", "host": [ @@ -191,29 +269,6 @@ }, "response": [] }, - { - "name": "POST Bind a Meter to a Combined Equipment", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"meter_id\":1, \"is_output\":false}}" - }, - "url": { - "raw": "{{base_url}}/combinedequipments/1/meters", - "host": [ - "{{base_url}}" - ], - "path": [ - "combinedequipments", - "1", - "meters" - ] - } - }, - "response": [] - }, { "name": "GET All Meters of a Combined Equipment", "request": { @@ -233,11 +288,60 @@ }, "response": [] }, + { + "name": "POST Bind a Meter to a Combined Equipment", + "request": { + "method": "POST", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], + "body": { + "mode": "raw", + "raw": "{\"data\":{\"meter_id\":1, \"is_output\":false}}" + }, + "url": { + "raw": "{{base_url}}/combinedequipments/1/meters", + "host": [ + "{{base_url}}" + ], + "path": [ + "combinedequipments", + "1", + "meters" + ] + } + }, + "response": [] + }, { "name": "DELETE a Meter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/meters/1", "host": [ @@ -257,7 +361,20 @@ "name": "POST Bind a Offline Meter to a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1, \"is_output\":false}}" @@ -299,7 +416,20 @@ "name": "DELETE an Offline Meter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/offlinemeters/1", "host": [ @@ -358,7 +488,20 @@ "name": "POST Create a point Parameter for a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"point\", \"constant\":null, \"point_id\":1, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -382,7 +525,20 @@ "name": "PUT Update a point Parameter for a Combined Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"point\", \"constant\":null, \"point_id\":3, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -407,7 +563,20 @@ "name": "POST Create a constant Parameter for a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test constant parameter\", \"parameter_type\":\"constant\", \"constant\":\"test constant\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -431,7 +600,20 @@ "name": "PUT Update a constant Parameter for a Combined Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter1\", \"parameter_type\":\"constant\", \"constant\":\"test constant1\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -456,7 +638,20 @@ "name": "POST Create a fraction Parameter for a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test fraction parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"8449878f-b368-4ad9-a41c-e2c49189297a\", \"denominator_meter_uuid\":\"3f8a66c4-8fbe-4e6d-8b40-15dee5290afd\"}}" @@ -480,7 +675,20 @@ "name": "PUT Update a fraction Parameter for a Combined Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test fraction parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"8449878f-b368-4ad9-a41c-e2c49189297a\", \"denominator_meter_uuid\":\"3f8a66c4-8fbe-4e6d-8b40-15dee5290afd\"}}" @@ -505,7 +713,20 @@ "name": "DELETE a Parameter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/parameters/16", "host": [ @@ -525,7 +746,20 @@ "name": "POST Bind a Virtual Meter to a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1, \"is_output\":false}}" @@ -567,7 +801,20 @@ "name": "DELETE a Virtual Meter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/virtualmeters/1", "host": [ @@ -582,17 +829,6 @@ } }, "response": [] - }, - { - "name": "New Request", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "" - } - }, - "response": [] } ] },