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

Merge branch 'develop'

pull/92/MERGE
guangyuzhang 2021-11-23 23:11:09 +08:00
parent 2a0ed5ba6c f812479e7f
commit 002b1cef78
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/app/controllers/settings/meter/meter.controller.js
View File

@ -130,6 +130,7 @@ app.controller('MeterController', function($scope, $translate, $uibModal, Meter
} }
}); });
modalInstance.result.then(function(meter) { modalInstance.result.then(function(meter) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
meter.energy_category_id = meter.energy_category.id; meter.energy_category_id = meter.energy_category.id;
meter.cost_center_id = meter.cost_center.id; meter.cost_center_id = meter.cost_center.id;
if(angular.isDefined(meter.energy_item)) { if(angular.isDefined(meter.energy_item)) {
@ -142,7 +143,7 @@ app.controller('MeterController', function($scope, $translate, $uibModal, Meter
} else { } else {
meter.master_meter_id = undefined; meter.master_meter_id = undefined;
} }
MeterService.addMeter(meter, function (response) { MeterService.addMeter(meter, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -186,6 +187,7 @@ app.controller('MeterController', function($scope, $translate, $uibModal, Meter
}); });
modalInstance.result.then(function(modifiedMeter) { modalInstance.result.then(function(modifiedMeter) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
modifiedMeter.energy_category_id = modifiedMeter.energy_category.id; modifiedMeter.energy_category_id = modifiedMeter.energy_category.id;
modifiedMeter.cost_center_id = modifiedMeter.cost_center.id; modifiedMeter.cost_center_id = modifiedMeter.cost_center.id;
if (modifiedMeter.energy_item != null && modifiedMeter.energy_item.id != null ) { if (modifiedMeter.energy_item != null && modifiedMeter.energy_item.id != null ) {
@ -198,7 +200,7 @@ app.controller('MeterController', function($scope, $translate, $uibModal, Meter
} else { } else {
modifiedMeter.master_meter_id = undefined; modifiedMeter.master_meter_id = undefined;
} }
MeterService.editMeter(modifiedMeter, function (response) { MeterService.editMeter(modifiedMeter, headers,function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -236,7 +238,8 @@ app.controller('MeterController', function($scope, $translate, $uibModal, Meter
}, },
function(isConfirm) { function(isConfirm) {
if (isConfirm) { if (isConfirm) {
MeterService.deleteMeter(meter, function (response) { let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
MeterService.deleteMeter(meter, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

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

@ -25,24 +25,24 @@ app.factory('MeterService', function($http) {
callback(response); callback(response);
}); });
}, },
addMeter: function(meter, callback) { addMeter: function(meter, headers, callback) {
$http.post(getAPI()+'meters',{data:meter}) $http.post(getAPI()+'meters',{data:meter}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
editMeter: function(meter, callback) { editMeter: function(meter, headers, callback) {
$http.put(getAPI()+'meters/'+meter.id,{data:meter}) $http.put(getAPI()+'meters/'+meter.id,{data:meter}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
deleteMeter: function(meter, callback) { deleteMeter: function(meter, headers, callback) {
$http.delete(getAPI()+'meters/'+meter.id) $http.delete(getAPI()+'meters/'+meter.id, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

5
myems-api/core/meter.py
View File

@ -3,7 +3,7 @@ import simplejson as json
import mysql.connector import mysql.connector
import config import config
import uuid import uuid
from core.useractivity import user_logger from core.useractivity import user_logger, access_control
class MeterCollection: class MeterCollection:
@ -105,6 +105,7 @@ class MeterCollection:
@user_logger @user_logger
def on_post(req, resp): def on_post(req, resp):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -373,6 +374,7 @@ class MeterItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_): def on_delete(req, resp, id_):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_METER_ID') description='API.INVALID_METER_ID')
@ -550,6 +552,7 @@ class MeterItem:
@user_logger @user_logger
def on_put(req, resp, id_): def on_put(req, resp, id_):
"""Handles PUT requests""" """Handles PUT requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex: