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

added access_control to combinedequipment

pull/90/head
Caozhenhui 2021-12-06 14:52:15 +08:00
parent b9de4e3c43
commit fb31837efa
9 changed files with 63 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js
View File

@ -1,7 +1,7 @@
'use strict';
app.controller('CombinedEquipmentController', function ($scope, $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) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -36,7 +36,8 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib
});
modalInstance.result.then(function (combinedequipment) {
combinedequipment.cost_center_id = combinedequipment.cost_center.id;
CombinedEquipmentService.addCombinedEquipment(combinedequipment, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentService.addCombinedEquipment(combinedequipment, headers,function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -76,8 +77,9 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib
});
modalInstance.result.then(function (modifiedCombinedEquipment) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
modifiedCombinedEquipment.cost_center_id = modifiedCombinedEquipment.cost_center.id;
CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, function (response) {
CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -115,7 +117,8 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib
},
function (isConfirm) {
if (isConfirm) {
CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

9
admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js
View File

@ -1,6 +1,7 @@
'use strict';
app.controller('CombinedEquipmentEquipmentController', function ($scope, $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};
$scope.getAllEquipments = function () {
@ -42,7 +43,8 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $transl
$scope.pairEquipment = function (dragEl, dropEl) {
var equipmentid = angular.element('#' + dragEl).scope().equipment.id;
var combinedequipmentid = $scope.currentCombinedEquipment.id;
CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -69,7 +71,8 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $transl
}
var combinedequipmentequipmentid = angular.element('#' + dragEl).scope().combinedequipmentequipment.id;
var combinedequipmentid = $scope.currentCombinedEquipment.id;
CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

9
admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js
View File

@ -1,6 +1,7 @@
'use strict';
app.controller('CombinedEquipmentMeterController', function ($scope, $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 };
$scope.getAllCombinedEquipments = function (id) {
@ -111,7 +112,8 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $
modalInstance.result.then(function (is_output) {
var meterid = angular.element('#' + dragEl).scope().meter.id;
var combinedequipmentid = $scope.currentCombinedEquipment.id;
CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -141,7 +143,8 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $
var combinedequipmentmeterid = angular.element('#' + dragEl).scope().combinedequipmentmeter.id;
var combinedequipmentid = $scope.currentCombinedEquipment.id;
var metertype = angular.element('#' + dragEl).scope().combinedequipmentmeter.metertype;
CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

10
admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js
View File

@ -73,8 +73,8 @@ app.controller('CombinedEquipmentParameterController', function (
if (combinedequipmentparameter.denominator_meter != null) {
combinedequipmentparameter.denominator_meter_uuid = combinedequipmentparameter.denominator_meter.uuid;
}
CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -123,7 +123,8 @@ app.controller('CombinedEquipmentParameterController', function (
if (modifiedCombinedEquipmentParameter.denominator_meter != null) {
modifiedCombinedEquipmentParameter.denominator_meter_uuid = modifiedCombinedEquipmentParameter.denominator_meter.uuid;
}
CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -160,7 +161,8 @@ app.controller('CombinedEquipmentParameterController', function (
},
function (isConfirm) {
if (isConfirm) {
CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

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

@ -17,24 +17,24 @@ app.factory('CombinedEquipmentService', function($http) {
callback(response);
});
},
addCombinedEquipment: function(combinedequipment, callback) {
$http.post(getAPI()+'combinedequipments',{data:combinedequipment})
addCombinedEquipment: function(combinedequipment, headers, callback) {
$http.post(getAPI()+'combinedequipments',{data:combinedequipment}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editCombinedEquipment: function(combinedequipment, callback) {
$http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment})
editCombinedEquipment: function(combinedequipment, headers, callback) {
$http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteCombinedEquipment: function(combinedequipment, callback) {
$http.delete(getAPI()+'combinedequipments/'+combinedequipment.id)
deleteCombinedEquipment: function(combinedequipment, headers, callback) {
$http.delete(getAPI()+'combinedequipments/'+combinedequipment.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('CombinedEquipmentEquipmentService', function($http) {
return {
addPair: function(combinedequipmentID,equipmentID,callback) {
$http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}})
addPair: function(combinedequipmentID,equipmentID, headers, callback) {
$http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}} ,{headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('CombinedEquipmentEquipmentService', function($http) {
});
},
deletePair: function(combinedequipmentID, equipmentID, callback) {
$http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID)
deletePair: function(combinedequipmentID, equipmentID, headers, callback) {
$http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js
View File

@ -1,7 +1,7 @@
'use strict';
app.factory('CombinedEquipmentMeterService', function ($http) {
return {
addPair: function (combinedequipmentID, meterID, metertype, is_output, callback) {
addPair: function (combinedequipmentID, 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('CombinedEquipmentMeterService', function ($http) {
} else {
meter = { 'offline_meter_id': meterID, is_output: is_output };
}
$http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter })
$http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter }, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -18,8 +18,8 @@ app.factory('CombinedEquipmentMeterService', function ($http) {
});
},
deletePair: function (combinedequipmentID, meterID, metertype, callback) {
$http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID)
deletePair: function (combinedequipmentID, meterID, metertype, headers, callback) {
$http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

13
admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js
View File

@ -10,16 +10,17 @@ app.factory('CombinedEquipmentParameterService', function($http) {
callback(response);
});
},
addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter,callback) {
$http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter})
addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter, headers, callback) {
$http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter,callback) {
$http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter})
editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter, headers, callback) {
$http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter}
, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -27,8 +28,8 @@ app.factory('CombinedEquipmentParameterService', function($http) {
});
},
deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, callback) {
$http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID)
deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, headers, callback) {
$http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

17
myems-api/core/combinedequipment.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 CombinedEquipmentCollection:
@ -62,6 +62,7 @@ class CombinedEquipmentCollection:
@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:
@ -204,6 +205,7 @@ class CombinedEquipmentItem:
@staticmethod
@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_COMBINED_EQUIPMENT_ID')
@ -279,6 +281,7 @@ class CombinedEquipmentItem:
@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_COMBINED_EQUIPMENT_ID')
@ -376,6 +379,7 @@ class CombinedEquipmentItem:
@user_logger
def on_post(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_COMBINED_EQUIPMENT_ID')
@ -566,6 +570,7 @@ class CombinedEquipmentEquipmentCollection:
@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:
@ -640,6 +645,7 @@ class CombinedEquipmentEquipmentItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, eid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_COMBINED_EQUIPMENT_ID')
@ -824,6 +830,7 @@ class CombinedEquipmentParameterCollection:
@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_COMBINED_EQUIPMENT_ID')
@ -1132,6 +1139,7 @@ class CombinedEquipmentParameterItem:
@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_COMBINED_EQUIPMENT_ID')
@ -1180,6 +1188,7 @@ class CombinedEquipmentParameterItem:
@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_COMBINED_EQUIPMENT_ID')
@ -1439,6 +1448,7 @@ class CombinedEquipmentMeterCollection:
@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:
@ -1519,6 +1529,7 @@ class CombinedEquipmentMeterItem:
@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_COMBINED_EQUIPMENT_ID')
@ -1629,6 +1640,7 @@ class CombinedEquipmentOfflineMeterCollection:
@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:
@ -1710,6 +1722,7 @@ class CombinedEquipmentOfflineMeterItem:
@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_COMBINED_EQUIPMENT_ID')
@ -1820,6 +1833,7 @@ class CombinedEquipmentVirtualMeterCollection:
@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:
@ -1901,6 +1915,7 @@ class CombinedEquipmentVirtualMeterItem:
@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_COMBINED_EQUIPMENT_ID')