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

added access control to distribution system in api and admin

pull/89/MERGE
13621160019@163.com 2021-12-03 19:09:39 +08:00
parent 05b5631408
commit 4e0961e5fb
3 changed files with 293 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js
View File

@ -49,11 +49,11 @@ app.controller('DistributionCircuitPointController', function (
});
};
$scope.changeDistributionCircuit=function(item,model){
$scope.currentDistributionCircuit=item;
$scope.currentDistributionCircuit.selected=model;
$scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id);
};
$scope.changeDistributionCircuit=function(item,model){
$scope.currentDistributionCircuit=item;
$scope.currentDistributionCircuit.selected=model;
$scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id);
};
$scope.changeDataSource = function (item, model) {
$scope.currentDataSource = model;

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

@ -1301,7 +1301,20 @@
"name": "POST Create Distribution System",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any admin users' UUID"
},
{
"key": "Token",
"value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"示例配电系统2\", \"svg\":\"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?><svg width=\\\"5cm\\\" height=\\\"4cm\\\" version=\\\"1.1\\\" xmlns=\\\"http://www.w3.org/2000/svg\\\"><desc>Four separate rectangles</desc><rect x=\\\".5cm\\\" y=\\\".5cm\\\" width=\\\"2cm\\\" height=\\\"1cm\\\"/></svg>\", \"description\":\"demo description\"}}"
@ -1322,7 +1335,20 @@
"name": "DELETE Distribution Systems 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": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/distributionsystems/2",
"host": [
@ -1340,7 +1366,20 @@
"name": "PUT Update Distribution System 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": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"示例配电系统1\", \"svg\":\"<?xml version=\\\"1.0\\\" encoding=\\\"UTF-8\\\"?><svg width=\\\"5cm\\\" height=\\\"4cm\\\" version=\\\"1.1\\\" xmlns=\\\"http://www.w3.org/2000/svg\\\"><desc>Four separate rectangles</desc><rect x=\\\".5cm\\\" y=\\\".5cm\\\" width=\\\"2cm\\\" height=\\\"1cm\\\"/></svg>\", \"description\":\"demo description\"}}"
@ -1376,49 +1415,6 @@
}
},
"response": []
},
{
"name": "POST Bind Distribution Circuit to Distribution System",
"request": {
"method": "POST",
"header": [],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"distribution_circuit_id\":\"1\"}}"
},
"url": {
"raw": "{{base_url}}/distributionsystems/1/distributioncircuits",
"host": [
"{{base_url}}"
],
"path": [
"distributionsystems",
"1",
"distributioncircuits"
]
}
},
"response": []
},
{
"name": "DELETE Unbind Distribution Circuit from Distribution System",
"request": {
"method": "DELETE",
"header": [],
"url": {
"raw": "{{base_url}}/distributionsystems/1/distributioncircuits/1",
"host": [
"{{base_url}}"
],
"path": [
"distributionsystems",
"1",
"distributioncircuits",
"1"
]
}
},
"response": []
}
]
},
@ -1464,7 +1460,20 @@
"name": "POST Create new Distribution Circuit",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any admin users' UUID"
},
{
"key": "Token",
"value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"51W92\", \"distribution_system_id\":1, \"distribution_room\":\"EW1\", \"switchgear\":\"51AL9\", \"peak_load\": 30, \"peak_current\": 53.6, \"customers\": \"地下室应急照明\", \"meters\": \"ALE-1102, ALE-1082\"}}"
@ -1485,7 +1494,20 @@
"name": "DELETE a Distribution Circuit 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": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/distributioncircuits/2",
"host": [
@ -1503,7 +1525,20 @@
"name": "PUT Update Distribution Circuit 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": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"51W91\", \"distribution_system_id\":1, \"distribution_room\":\"EW1\", \"switchgear\":\"51AL9\", \"peak_load\": 30, \"peak_current\": 53.6, \"customers\": \"地下室应急照明\", \"meters\": \"ALE-1102, ALE-1082\"}}"
@ -1525,10 +1560,23 @@
"name": "POST Bind Point to Distribution Circuit",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any admin users' UUID"
},
{
"key": "Token",
"value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"point_id\":\"1\"}}"
"raw": "{\"data\":{\"point_id\":\"2\"}}"
},
"url": {
"raw": "{{base_url}}/distributioncircuits/1/points",
@ -1567,9 +1615,22 @@
"name": "DELETE Unbind Point from Distribution Circuit",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any admin users' UUID"
},
{
"key": "Token",
"value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/distributioncircuits/1/points/1",
"raw": "{{base_url}}/distributioncircuits/1/points/2",
"host": [
"{{base_url}}"
],
@ -1577,7 +1638,7 @@
"distributioncircuits",
"1",
"points",
"1"
"2"
]
}
},
@ -3644,7 +3705,7 @@
"response": []
},
{
"name": "POST Meter Point Relation",
"name": "POST Bind Point to Meter",
"request": {
"method": "POST",
"header": [
@ -3699,7 +3760,7 @@
"response": []
},
{
"name": "DELETE Meter Point Relation",
"name": "DELETE Unbind Point from Meter",
"request": {
"method": "DELETE",
"header": [

342
myems-api/README.md
View File

File diff suppressed because it is too large Load Diff