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

Merge branch 'develop'

pull/92/MERGE
13621160019@163.com 2021-12-06 23:04:43 +08:00
parent ed6941545a 15cc27ac18
commit 0413ca15ea
16 changed files with 359 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
admin/app/controllers/settings/equipment/equipment.controller.js
View File

@ -1,7 +1,15 @@
'use strict';
app.controller('EquipmentController', function($scope, $translate, $uibModal, EquipmentService, CostCenterService, toaster,SweetAlert) {
app.controller('EquipmentController', function(
$scope,
$window,
$translate,
$uibModal,
EquipmentService,
CostCenterService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllEquipments = function() {
EquipmentService.getAllEquipments(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -36,7 +44,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq
});
modalInstance.result.then(function(equipment) {
equipment.cost_center_id = equipment.cost_center.id;
EquipmentService.addEquipment(equipment, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentService.addEquipment(equipment, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -77,7 +86,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq
modalInstance.result.then(function(modifiedEquipment) {
modifiedEquipment.cost_center_id = modifiedEquipment.cost_center.id;
EquipmentService.editEquipment(modifiedEquipment, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentService.editEquipment(modifiedEquipment, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -114,7 +124,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq
closeOnCancel: true },
function (isConfirm) {
if (isConfirm) {
EquipmentService.deleteEquipment(equipment, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentService.deleteEquipment(equipment, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

23
admin/app/controllers/settings/equipment/equipmentmeter.controller.js
View File

@ -1,9 +1,22 @@
'use strict';
app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentMeterService, EquipmentService, toaster,SweetAlert) {
app.controller('EquipmentMeterController', function(
$scope,
$window,
$timeout,
$uibModal,
$translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
EquipmentMeterService,
EquipmentService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.currentEquipment = {selected:undefined};
$scope.getAllEquipments = function(id) {
$scope.getAllEquipments = function(id) {
EquipmentService.getAllEquipments(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.equipments = response.data;
@ -111,7 +124,8 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $
modalInstance.result.then(function (is_output) {
var meterid=angular.element('#'+dragEl).scope().meter.id;
var equipmentid=$scope.currentEquipment.id;
EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -140,7 +154,8 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $
var equipmentmeterid = angular.element('#' + dragEl).scope().equipmentmeter.id;
var equipmentid = $scope.currentEquipment.id;
var metertype = angular.element('#' + dragEl).scope().equipmentmeter.metertype;
EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

15
admin/app/controllers/settings/equipment/equipmentparameter.controller.js
View File

@ -73,8 +73,8 @@ app.controller('EquipmentParameterController', function(
if (equipmentparameter.denominator_meter != null) {
equipmentparameter.denominator_meter_uuid = equipmentparameter.denominator_meter.uuid;
}
EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -123,7 +123,9 @@ app.controller('EquipmentParameterController', function(
if (modifiedEquipmentParameter.denominator_meter != null) {
modifiedEquipmentParameter.denominator_meter_uuid = modifiedEquipmentParameter.denominator_meter.uuid;
}
EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id,
modifiedEquipmentParameter, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -160,7 +162,9 @@ app.controller('EquipmentParameterController', function(
},
function(isConfirm) {
if (isConfirm) {
EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id,
equipmentparameter.id, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",
@ -179,7 +183,8 @@ app.controller('EquipmentParameterController', function(
}
});
}
});
}
);
};
$scope.colorMeterType = function(type) {

12
admin/app/services/settings/equipment/equipment.service.js
View File

@ -17,24 +17,24 @@ app.factory('EquipmentService', function($http) {
callback(response);
});
},
addEquipment: function(equipment, callback) {
$http.post(getAPI()+'equipments',{data:equipment})
addEquipment: function(equipment, headers, callback) {
$http.post(getAPI()+'equipments',{data:equipment}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editEquipment: function(equipment, callback) {
$http.put(getAPI()+'equipments/'+equipment.id,{data:equipment})
editEquipment: function(equipment, headers, callback) {
$http.put(getAPI()+'equipments/'+equipment.id,{data:equipment}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteEquipment: function(equipment, callback) {
$http.delete(getAPI()+'equipments/'+equipment.id)
deleteEquipment: function(equipment, headers, callback) {
$http.delete(getAPI()+'equipments/'+equipment.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/equipment/equipmentmeter.service.js
View File

@ -1,7 +1,7 @@
'use strict';
app.factory('EquipmentMeterService', function($http) {
return {
addPair: function(equipmentID,meterID,metertype,is_output,callback) {
addPair: function(equipmentID, meterID, metertype, is_output, headers, callback) {
var meter={};
if(metertype=='meters'){
meter={'meter_id':meterID,is_output:is_output};
@ -10,7 +10,7 @@ app.factory('EquipmentMeterService', function($http) {
}else{
meter={'offline_meter_id':meterID,is_output:is_output};
}
$http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter})
$http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -18,8 +18,8 @@ app.factory('EquipmentMeterService', function($http) {
});
},
deletePair: function(equipmentID,meterID,metertype, callback) {
$http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID)
deletePair: function(equipmentID,meterID,metertype, headers, callback) {
$http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

12
admin/app/services/settings/equipment/equipmentparameter.service.js
View File

@ -10,16 +10,16 @@ app.factory('EquipmentParameterService', function($http) {
callback(response);
});
},
addEquipmentParameter: function(equipmentID, equipmentparameter,callback) {
$http.post(getAPI()+'equipments/'+equipmentID+'/parameters',{data:equipmentparameter})
addEquipmentParameter: function(equipmentID, equipmentparameter, headers, callback) {
$http.post(getAPI()+'equipments/'+equipmentID+'/parameters',{data:equipmentparameter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editEquipmentParameter: function(equipmentID,equipmentparameter,callback) {
$http.put(getAPI()+'equipments/'+equipmentID+'/parameters/'+equipmentparameter.id,{data:equipmentparameter})
editEquipmentParameter: function(equipmentID, equipmentparameter, headers, callback) {
$http.put(getAPI()+'equipments/'+equipmentID+'/parameters/'+equipmentparameter.id,{data:equipmentparameter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -27,8 +27,8 @@ app.factory('EquipmentParameterService', function($http) {
});
},
deleteEquipmentParameter: function(equipmentID, parameterID, callback) {
$http.delete(getAPI()+'equipments/'+equipmentID+'/parameters/'+parameterID)
deleteEquipmentParameter: function(equipmentID, parameterID, headers, callback) {
$http.delete(getAPI()+'equipments/'+equipmentID+'/parameters/'+parameterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

2
admin/nginx.conf vendored
View File

@ -46,7 +46,7 @@ http {
}
location /api {
proxy_pass http://127.0.0.1:8000/;
proxy_pass http://192.168.1.6:8000/;
proxy_connect_timeout 75;
proxy_read_timeout 600;
send_timeout 600;

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

@ -2886,14 +2886,10 @@
"name": "Equipment",
"item": [
{
"name": "POST Create New Equipment",
"name": "GET All Equipments",
"request": {
"method": "POST",
"method": "GET",
"header": [],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}"
},
"url": {
"raw": "{{base_url}}/equipments",
"host": [
@ -2907,10 +2903,27 @@
"response": []
},
{
"name": "GET All Equipments",
"name": "POST Create New 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}"
},
"url": {
"raw": "{{base_url}}/equipments",
"host": [
@ -2929,13 +2942,13 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{base_url}}/equipments/3",
"raw": "{{base_url}}/equipments/1",
"host": [
"{{base_url}}"
],
"path": [
"equipments",
"3"
"1"
]
}
},
@ -2945,19 +2958,32 @@
"name": "PUT Update an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":true, \"cost_center_id\":1, \"description\":\"equipment description\"}}"
"raw": "{\"data\":{\"name\":\"new MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":true, \"cost_center_id\":1, \"description\":\"equipment description\"}}"
},
"url": {
"raw": "{{base_url}}/equipments/3",
"raw": "{{base_url}}/equipments/1",
"host": [
"{{base_url}}"
],
"path": [
"equipments",
"3"
"1"
]
}
},
@ -2967,7 +2993,20 @@
"name": "POST Clone an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{}}"
@ -2989,15 +3028,28 @@
"name": "DELETE an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/equipments/2",
"raw": "{{base_url}}/equipments/4",
"host": [
"{{base_url}}"
],
"path": [
"equipments",
"2"
"4"
]
}
},
@ -3007,10 +3059,23 @@
"name": "POST Bind a Meter to an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"meter_id\":1, \"is_output\":false}}"
"raw": "{\"data\":{\"meter_id\":3, \"is_output\":false}}"
},
"url": {
"raw": "{{base_url}}/equipments/1/meters",
@ -3045,11 +3110,57 @@
},
"response": []
},
{
"name": "DELETE a Meter from an Equipment",
"request": {
"method": "DELETE",
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text",
"description": "Any admin users' UUID"
},
{
"key": "Token",
"value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/equipments/1/meters/1",
"host": [
"{{base_url}}"
],
"path": [
"equipments",
"1",
"meters",
"1"
]
}
},
"response": []
},
{
"name": "POST Bind a Offline Meter to an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"offline_meter_id\":1, \"is_output\":false}}"
@ -3068,26 +3179,6 @@
},
"response": []
},
{
"name": "DELETE a Meter from an Equipment",
"request": {
"method": "DELETE",
"header": [],
"url": {
"raw": "{{base_url}}/equipments/1/meters/1",
"host": [
"{{base_url}}"
],
"path": [
"equipments",
"1",
"meters",
"1"
]
}
},
"response": []
},
{
"name": "GET All Offline Meters of an Equipment",
"request": {
@ -3111,7 +3202,20 @@
"name": "DELETE an Offline Meter from an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/equipments/1/offlinemeters/1",
"host": [
@ -3152,7 +3256,7 @@
"method": "GET",
"header": [],
"url": {
"raw": "{{base_url}}/equipments/1/parameters/1",
"raw": "{{base_url}}/equipments/1/parameters/2",
"host": [
"{{base_url}}"
],
@ -3160,7 +3264,7 @@
"equipments",
"1",
"parameters",
"1"
"2"
]
}
},
@ -3170,7 +3274,20 @@
"name": "POST Create a point Parameter for an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"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}}"
@ -3194,7 +3311,20 @@
"name": "PUT Update a point Parameter for an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"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}}"
@ -3219,7 +3349,20 @@
"name": "POST Create a constant Parameter for an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"constant\", \"constant\":\"test constant\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}"
@ -3243,7 +3386,20 @@
"name": "PUT Update a constant Parameter for an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"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}}"
@ -3268,7 +3424,20 @@
"name": "POST Create a fraction Parameter for an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"89ff5118-d0c2-4dd8-8098-a8698189b2ea\", \"denominator_meter_uuid\":\"5ca62d2a-908e-40c5-a6b5-a8e436d60db4\"}}"
@ -3292,7 +3461,20 @@
"name": "PUT Update a fraction Parameter for an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"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\":\"89ff5118-d0c2-4dd8-8098-a8698189b2ea\", \"denominator_meter_uuid\":\"5ca62d2a-908e-40c5-a6b5-a8e436d60db4\"}}"
@ -3317,7 +3499,20 @@
"name": "DELETE a Parameter from an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/equipments/1/parameters/16",
"host": [
@ -3337,7 +3532,20 @@
"name": "POST Bind a Virtual Meter to an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"virtual_meter_id\":1, \"is_output\":false}}"
@ -3379,7 +3587,20 @@
"name": "DELETE a Virtual Meter from an 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": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01",
"type": "text",
"description": "Login to get a valid token"
}
],
"url": {
"raw": "{{base_url}}/equipments/1/virtualmeters/1",
"host": [

2
myems-api/core/costcenter.py
View File

@ -3,7 +3,7 @@ import simplejson as json
import mysql.connector
import config
import uuid
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class CostCenterCollection:

15
myems-api/core/equipment.py
View File

@ -3,7 +3,7 @@ import simplejson as json
import mysql.connector
import config
import uuid
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class EquipmentCollection:
@ -62,6 +62,7 @@ class EquipmentCollection:
@user_logger
def on_post(req, resp):
"""Handles POST requests"""
access_control(req)
try:
raw_json = req.stream.read().decode('utf-8')
except Exception as ex:
@ -205,6 +206,7 @@ class EquipmentItem:
@user_logger
@user_logger
def on_delete(req, resp, id_):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -293,6 +295,7 @@ class EquipmentItem:
@user_logger
def on_put(req, resp, id_):
"""Handles PUT requests"""
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -667,6 +670,7 @@ class EquipmentParameterCollection:
@user_logger
def on_post(req, resp, id_):
"""Handles POST requests"""
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -976,6 +980,7 @@ class EquipmentParameterItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, pid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -1024,6 +1029,7 @@ class EquipmentParameterItem:
@user_logger
def on_put(req, resp, id_, pid):
"""Handles PUT requests"""
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -1283,6 +1289,7 @@ class EquipmentMeterCollection:
@user_logger
def on_post(req, resp, id_):
"""Handles POST requests"""
access_control(req)
try:
raw_json = req.stream.read().decode('utf-8')
except Exception as ex:
@ -1307,6 +1314,7 @@ class EquipmentMeterCollection:
description='API.INVALID_IS_OUTPUT_VALUE')
is_output = new_values['data']['is_output']
cnx = mysql.connector.connect(**config.myems_system_db)
cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor()
@ -1363,6 +1371,7 @@ class EquipmentMeterItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, mid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -1472,6 +1481,7 @@ class EquipmentOfflineMeterCollection:
@user_logger
def on_post(req, resp, id_):
"""Handles POST requests"""
access_control(req)
try:
raw_json = req.stream.read().decode('utf-8')
except Exception as ex:
@ -1552,6 +1562,7 @@ class EquipmentOfflineMeterItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, mid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')
@ -1662,6 +1673,7 @@ class EquipmentVirtualMeterCollection:
@user_logger
def on_post(req, resp, id_):
"""Handles POST requests"""
access_control(req)
try:
raw_json = req.stream.read().decode('utf-8')
except Exception as ex:
@ -1742,6 +1754,7 @@ class EquipmentVirtualMeterItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, mid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_EQUIPMENT_ID')

2
myems-api/core/offlinemeter.py
View File

@ -3,7 +3,7 @@ import simplejson as json
import mysql.connector
import config
import uuid
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class OfflineMeterCollection:

4
myems-api/core/rule.py
View File

@ -1,10 +1,10 @@
import falcon
import json
import simplejson as json
import mysql.connector
import uuid
from datetime import datetime, timezone, timedelta
import config
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class RuleCollection:

2
myems-api/core/space.py
View File

@ -6,7 +6,7 @@ import uuid
from datetime import datetime
from anytree import AnyNode
from anytree.exporter import JsonExporter
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class SpaceCollection:

2
myems-api/core/tariff.py
View File

@ -4,7 +4,7 @@ import mysql.connector
import config
import uuid
from datetime import datetime, timedelta, timezone
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class TariffCollection:

2
myems-api/core/virtualmeter.py
View File

@ -3,7 +3,7 @@ import simplejson as json
import mysql.connector
import config
import uuid
from core.useractivity import user_logger
from core.useractivity import user_logger, access_control
class VirtualMeterCollection:

2
web/nginx.conf vendored
View File

@ -47,7 +47,7 @@ http {
}
location /api {
proxy_pass http://127.0.0.1:8000/;
proxy_pass http://192.168.1.6:8000/;
proxy_connect_timeout 75;
proxy_read_timeout 600;
send_timeout 600;