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

added access control to space, offline meter and virtual meter in api and admin

pull/85/MERGE
13621160019@163.com 2021-12-10 19:24:49 +08:00
parent 849934afa3
commit af7157fff9
6 changed files with 90 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
admin/app/controllers/settings/space/spacecombinedequipment.controller.js
View File

@ -1,19 +1,19 @@
'use strict'; 'use strict';
app.controller('SpaceCombinedEquipmentController', function($scope, app.controller('SpaceCombinedEquipmentController', function($scope,
$window, $window,
$translate, $translate,
SpaceService, SpaceService,
CombinedEquipmentService, CombinedEquipmentService,
SpaceCombinedEquipmentService, SpaceCombinedEquipmentService,
toaster) { toaster) {
$scope.spaces = []; $scope.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.combinedequipments = []; $scope.combinedequipments = [];
$scope.spacecombinedequipments = []; $scope.spacecombinedequipments = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() { $scope.getAllSpaces = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -45,7 +45,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope,
$scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID); $scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getCombinedEquipmentsBySpaceID = function(id) { $scope.getCombinedEquipmentsBySpaceID = function(id) {
$scope.spacecombinedequipments=[]; $scope.spacecombinedequipments=[];
@ -72,7 +72,6 @@ app.controller('SpaceCombinedEquipmentController', function($scope,
var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id; var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id;
var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, headers, function (response){ SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, headers, function (response){
if (angular.isDefined(response.status) && response.status === 201) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
@ -100,7 +99,6 @@ app.controller('SpaceCombinedEquipmentController', function($scope,
var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id; var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id;
var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) { SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({

29
admin/app/controllers/settings/space/spaceequipment.controller.js
View File

@ -1,20 +1,20 @@
'use strict'; 'use strict';
app.controller('SpaceEquipmentController', function( app.controller('SpaceEquipmentController', function(
$scope, $scope,
$window, $window,
$translate, $translate,
SpaceService, SpaceService,
EquipmentService, EquipmentService,
SpaceEquipmentService, SpaceEquipmentService,
toaster,SweetAlert) { toaster,SweetAlert) {
$scope.spaces = []; $scope.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.equipments = []; $scope.equipments = [];
$scope.spaceequipments = []; $scope.spaceequipments = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() { $scope.getAllSpaces = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -46,7 +46,7 @@ app.controller('SpaceEquipmentController', function(
$scope.getEquipmentsBySpaceID($scope.currentSpaceID); $scope.getEquipmentsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getEquipmentsBySpaceID = function(id) { $scope.getEquipmentsBySpaceID = function(id) {
$scope.spaceequipments=[]; $scope.spaceequipments=[];
@ -100,7 +100,6 @@ app.controller('SpaceEquipmentController', function(
var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id; var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id;
var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected(); var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) { SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({

40
admin/app/controllers/settings/space/spacemeter.controller.js
View File

@ -1,20 +1,20 @@
'use strict'; 'use strict';
app.controller('SpaceMeterController', function( app.controller('SpaceMeterController', function(
$scope , $scope ,
$window, $window,
$timeout, $timeout,
$translate, $translate,
SpaceService, SpaceService,
MeterService, MeterService,
VirtualMeterService, VirtualMeterService,
OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
$scope.spaces = []; $scope.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.spacemeters = []; $scope.spacemeters = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() { $scope.getAllSpaces = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -47,7 +47,7 @@ app.controller('SpaceMeterController', function(
$scope.getMetersBySpaceID($scope.currentSpaceID); $scope.getMetersBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getMetersBySpaceID = function(id) { $scope.getMetersBySpaceID = function(id) {
var metertypes=['meters','virtualmeters','offlinemeters']; var metertypes=['meters','virtualmeters','offlinemeters'];
@ -177,12 +177,12 @@ app.controller('SpaceMeterController', function(
}); });
}; };
$scope.getAllSpaces(); $scope.getAllSpaces();
$scope.getAllMeters(); $scope.getAllMeters();
$scope.getAllVirtualMeters(); $scope.getAllVirtualMeters();
$scope.getAllOfflineMeters(); $scope.getAllOfflineMeters();
$scope.refreshSpaceTree = function() { $scope.refreshSpaceTree = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -210,7 +210,7 @@ app.controller('SpaceMeterController', function(
angular.element(spacetreewithmeter).jstree(true).settings.core.data = treedata['core']['data']; angular.element(spacetreewithmeter).jstree(true).settings.core.data = treedata['core']['data'];
angular.element(spacetreewithmeter).jstree(true).refresh(); angular.element(spacetreewithmeter).jstree(true).refresh();
}); });
}; };
$scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.$on('handleBroadcastSpaceChanged', function(event) {
$scope.spacemeters = []; $scope.spacemeters = [];

28
admin/app/controllers/settings/space/spaceshopfloor.controller.js
View File

@ -1,19 +1,19 @@
'use strict'; 'use strict';
app.controller('SpaceShopfloorController', function( app.controller('SpaceShopfloorController', function(
$scope, $scope,
$window, $window,
$translate, $translate,
SpaceService, SpaceService,
ShopfloorService, ShopfloorService,
SpaceShopfloorService, toaster,SweetAlert) { SpaceShopfloorService, toaster,SweetAlert) {
$scope.spaces = []; $scope.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.shopfloors = []; $scope.shopfloors = [];
$scope.spaceshopfloors = []; $scope.spaceshopfloors = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() { $scope.getAllSpaces = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -45,7 +45,7 @@ app.controller('SpaceShopfloorController', function(
$scope.getShopfloorsBySpaceID($scope.currentSpaceID); $scope.getShopfloorsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getShopfloorsBySpaceID = function(id) { $scope.getShopfloorsBySpaceID = function(id) {
$scope.spaceshopfloors=[]; $scope.spaceshopfloors=[];
@ -119,7 +119,7 @@ app.controller('SpaceShopfloorController', function(
}); });
}; };
$scope.getAllSpaces(); $scope.getAllSpaces();
$scope.getAllShopfloors(); $scope.getAllShopfloors();
$scope.refreshSpaceTree = function() { $scope.refreshSpaceTree = function() {

25
admin/app/controllers/settings/space/spacestore.controller.js
View File

@ -1,18 +1,18 @@
'use strict'; 'use strict';
app.controller('SpaceStoreController', function( app.controller('SpaceStoreController', function(
$scope, $scope,
$window, $window,
$translate, $translate,
SpaceService, SpaceService,
StoreService, SpaceStoreService, toaster,SweetAlert) { StoreService, SpaceStoreService, toaster,SweetAlert) {
$scope.spaces = []; $scope.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.stores = []; $scope.stores = [];
$scope.spacestores = []; $scope.spacestores = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() { $scope.getAllSpaces = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -44,7 +44,7 @@ app.controller('SpaceStoreController', function(
$scope.getStoresBySpaceID($scope.currentSpaceID); $scope.getStoresBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getStoresBySpaceID = function(id) { $scope.getStoresBySpaceID = function(id) {
$scope.spacestores=[]; $scope.spacestores=[];
@ -99,7 +99,6 @@ app.controller('SpaceStoreController', function(
var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id; var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id;
var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected(); var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) { SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({

35
admin/app/controllers/settings/space/spacetenant.controller.js
View File

@ -1,19 +1,19 @@
'use strict'; 'use strict';
app.controller('SpaceTenantController', function( app.controller('SpaceTenantController', function(
$scope, $scope,
$window, $window,
$translate, $translate,
SpaceService, SpaceService,
TenantService, TenantService,
SpaceTenantService, toaster,SweetAlert) { SpaceTenantService, toaster,SweetAlert) {
$scope.spaces = []; $scope.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.tenants = []; $scope.tenants = [];
$scope.spacetenants = []; $scope.spacetenants = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSpaces = function() { $scope.getAllSpaces = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -45,7 +45,7 @@ app.controller('SpaceTenantController', function(
$scope.getTenantsBySpaceID($scope.currentSpaceID); $scope.getTenantsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getTenantsBySpaceID = function(id) { $scope.getTenantsBySpaceID = function(id) {
$scope.spacetenants=[]; $scope.spacetenants=[];
@ -99,7 +99,6 @@ app.controller('SpaceTenantController', function(
var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id; var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id;
var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected(); var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) { SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
@ -120,10 +119,10 @@ app.controller('SpaceTenantController', function(
}); });
}; };
$scope.getAllSpaces(); $scope.getAllSpaces();
$scope.getAllTenants(); $scope.getAllTenants();
$scope.refreshSpaceTree = function() { $scope.refreshSpaceTree = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -151,7 +150,7 @@ app.controller('SpaceTenantController', function(
angular.element(spacetreewithtenant).jstree(true).settings.core.data = treedata['core']['data']; angular.element(spacetreewithtenant).jstree(true).settings.core.data = treedata['core']['data'];
angular.element(spacetreewithtenant).jstree(true).refresh(); angular.element(spacetreewithtenant).jstree(true).refresh();
}); });
}; };
$scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.$on('handleBroadcastSpaceChanged', function(event) {
$scope.spacetenants = []; $scope.spacetenants = [];