Merge remote-tracking branch 'origin/develop' into develop
tianlinzhong
commit
f685728985
|
|
@ -1,6 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyItemController', function($scope, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) {
|
||||
app.controller('EnergyItemController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$translate,
|
||||
$uibModal,
|
||||
CategoryService,
|
||||
EnergyItemService,
|
||||
toaster,
|
||||
SweetAlert) {
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
|
|
@ -38,7 +47,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(energyItem) {
|
||||
EnergyItemService.addEnergyItem(energyItem, function(response) {
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
EnergyItemService.addEnergyItem(energyItem, headers, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -78,7 +88,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedEnergyItem) {
|
||||
EnergyItemService.editEnergyItem(modifiedEnergyItem, function (response){
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
EnergyItemService.editEnergyItem(modifiedEnergyItem, headers, function (response){
|
||||
if(angular.isDefined(response.status) && response.status === 200){
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -114,7 +125,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca
|
|||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
EnergyItemService.deleteEnergyItem(energyItem, function (response) {
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
EnergyItemService.deleteEnergyItem(energyItem, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
|
|||
|
|
@ -17,24 +17,24 @@ app.factory('EnergyItemService', function($http) {
|
|||
callback(response);
|
||||
});
|
||||
},
|
||||
addEnergyItem: function(energyItem, callback) {
|
||||
$http.post(getAPI()+'energyitems',{data:energyItem})
|
||||
addEnergyItem: function(energyItem, headers, callback) {
|
||||
$http.post(getAPI()+'energyitems',{data:energyItem}, {headers})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEnergyItem: function(energyItem, callback) {
|
||||
$http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem})
|
||||
editEnergyItem: function(energyItem, headers, callback) {
|
||||
$http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem}, {headers})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteEnergyItem: function(energyItem, callback) {
|
||||
$http.delete(getAPI()+'energyitems/'+energyItem.id)
|
||||
deleteEnergyItem: function(energyItem, headers, callback) {
|
||||
$http.delete(getAPI()+'energyitems/'+energyItem.id, {headers})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
|
|
|
|||
|
|
@ -2342,7 +2342,20 @@
|
|||
"name": "POST Create an Energy Item",
|
||||
"request": {
|
||||
"method": "POST",
|
||||
"header": [],
|
||||
"header": [
|
||||
{
|
||||
"key": "User-UUID",
|
||||
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
|
||||
"description": "Any admin users' UUID",
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"key": "Token",
|
||||
"value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2",
|
||||
"description": "Login to get a valid token",
|
||||
"type": "text"
|
||||
}
|
||||
],
|
||||
"body": {
|
||||
"mode": "raw",
|
||||
"raw": "{\"data\":{\"name\":\"租户用电\",\"energy_category_id\":1}}"
|
||||
|
|
@ -2363,7 +2376,20 @@
|
|||
"name": "PUT Update an Energy Item",
|
||||
"request": {
|
||||
"method": "PUT",
|
||||
"header": [],
|
||||
"header": [
|
||||
{
|
||||
"key": "User-UUID",
|
||||
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
|
||||
"description": "Any admin users' UUID",
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"key": "Token",
|
||||
"value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2",
|
||||
"description": "Login to get a valid token",
|
||||
"type": "text"
|
||||
}
|
||||
],
|
||||
"body": {
|
||||
"mode": "raw",
|
||||
"raw": "{\"data\":{\"name\":\"空调用\",\"energy_category_id\":1}}"
|
||||
|
|
@ -2385,7 +2411,20 @@
|
|||
"name": "DELETE an Energy Item",
|
||||
"request": {
|
||||
"method": "DELETE",
|
||||
"header": [],
|
||||
"header": [
|
||||
{
|
||||
"key": "User-UUID",
|
||||
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ",
|
||||
"description": "Any admin users' UUID",
|
||||
"type": "text"
|
||||
},
|
||||
{
|
||||
"key": "Token",
|
||||
"value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2",
|
||||
"description": "Login to get a valid token",
|
||||
"type": "text"
|
||||
}
|
||||
],
|
||||
"url": {
|
||||
"raw": "{{base_url}}/energyitems/4",
|
||||
"host": [
|
||||
|
|
|
|||
|
|
@ -669,15 +669,15 @@ curl -i -X GET {{base_url}}/energyitems
|
|||
```
|
||||
* DELETE an Energy Item by ID
|
||||
```bash
|
||||
curl -i -X DELETE {{base_url}}/energyitems/{id}
|
||||
curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/energyitems/{id}
|
||||
```
|
||||
* POST Create an Energy Item
|
||||
```bash
|
||||
curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"空调用电","energy_category_id":1}}' {{base_url}}/energyitems
|
||||
curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"空调用电","energy_category_id":1}}' {{base_url}}/energyitems
|
||||
```
|
||||
* PUT Update an Energy Item
|
||||
```bash
|
||||
curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"动力用电","energy_category_id":1}}' {{base_url}}/energyitems/{id}
|
||||
curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"动力用电","energy_category_id":1}}' {{base_url}}/energyitems/{id}
|
||||
```
|
||||
|
||||
### Equipment
|
||||
|
|
|
|||
|
|
@ -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 EnergyItemCollection:
|
||||
|
|
@ -55,6 +55,7 @@ class EnergyItemCollection:
|
|||
@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:
|
||||
|
|
@ -165,6 +166,7 @@ class EnergyItemItem:
|
|||
@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_ENERGY_ITEM_ID')
|
||||
|
|
@ -225,6 +227,7 @@ class EnergyItemItem:
|
|||
@user_logger
|
||||
def on_put(req, resp, id_):
|
||||
"""Handles PUT requests"""
|
||||
access_control(req)
|
||||
try:
|
||||
raw_json = req.stream.read().decode('utf-8')
|
||||
except Exception as ex:
|
||||
|
|
|
|||
Loading…
Reference in New Issue