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

Merge branch 'develop'

pull/100/head
13621160019@163.com 2021-12-08 23:31:38 +08:00
parent 9504aa856f 37a44353a8
commit c527991082
35 changed files with 822 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/Dockerfile vendored
View File

@ -1,4 +1,4 @@
FROM nginx:1.21.1
FROM nginx:1.21.4
# remove the default config
RUN rm /etc/nginx/conf.d/default.conf && \

22
admin/app/controllers/settings/shopfloor/shopfloor.controller.js
View File

@ -1,7 +1,16 @@
'use strict';
app.controller('ShopfloorController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) {
app.controller('ShopfloorController', function (
$scope,
$window,
$translate,
$uibModal,
CostCenterService,
ContactService,
ShopfloorService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllCostCenters = function () {
CostCenterService.getAllCostCenters(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -53,7 +62,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C
if (angular.isDefined(shopfloor.is_input_counted) == false) {
shopfloor.is_input_counted = false;
}
ShopfloorService.addShopfloor(shopfloor, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorService.addShopfloor(shopfloor, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -99,7 +109,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C
if (angular.isDefined(shopfloor.is_input_counted) == false) {
shopfloor.is_input_counted = false;
}
ShopfloorService.editShopfloor(modifiedShopfloor, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorService.editShopfloor(modifiedShopfloor, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -136,7 +147,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C
},
function (isConfirm) {
if (isConfirm) {
ShopfloorService.deleteShopfloor(shopfloor, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorService.deleteShopfloor(shopfloor, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

18
admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js
View File

@ -1,8 +1,16 @@
'use strict';
app.controller('ShopfloorEquipmentController', function ($scope, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) {
app.controller('ShopfloorEquipmentController', function (
$scope,
$window,
$translate,
ShopfloorService,
EquipmentService,
ShopfloorEquipmentService,
toaster,
SweetAlert) {
$scope.currentShopfloor = {selected:undefined};
$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) {
@ -42,7 +50,8 @@ app.controller('ShopfloorEquipmentController', function ($scope, $translate, Sho
$scope.pairEquipment = function (dragEl, dropEl) {
var equipmentid = angular.element('#' + dragEl).scope().equipment.id;
var shopfloorid = $scope.currentShopfloor.id;
ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -68,7 +77,8 @@ app.controller('ShopfloorEquipmentController', function ($scope, $translate, Sho
}
var shopfloorequipmentid = angular.element('#' + dragEl).scope().shopfloorequipment.id;
var shopfloorid = $scope.currentShopfloor.id;
ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

27
admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js
View File

@ -1,14 +1,18 @@
'use strict';
app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
ShopfloorMeterService,
ShopfloorService,
toaster) {
app.controller('ShopfloorMeterController', function(
$scope,
$window,
$timeout,
$translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
ShopfloorMeterService,
ShopfloorService,
toaster) {
$scope.currentShopfloor = {selected:undefined};
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllShopfloors = function(id) {
ShopfloorService.getAllShopfloors(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -80,7 +84,6 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
};
$scope.getAllOfflineMeters = function() {
OfflineMeterService.getAllOfflineMeters(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -106,7 +109,8 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
$scope.pairMeter=function(dragEl,dropEl){
var meterid=angular.element('#'+dragEl).scope().meter.id;
var shopfloorid=$scope.currentShopfloor.id;
ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -133,7 +137,8 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
var shopfloormeterid = angular.element('#' + dragEl).scope().shopfloormeter.id;
var shopfloorid = $scope.currentShopfloor.id;
var metertype = angular.element('#' + dragEl).scope().shopfloormeter.metertype;
ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

6
admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js
View File

@ -74,7 +74,8 @@ app.controller('ShopfloorPointController', function (
$scope.pairPoint = function (dragEl, dropEl) {
var pointid = angular.element('#' + dragEl).scope().point.id;
var shopfloorid = $scope.currentShopfloor.id;
ShopfloorPointService.addPair(shopfloorid, pointid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorPointService.addPair(shopfloorid, pointid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -100,7 +101,8 @@ app.controller('ShopfloorPointController', function (
}
var shopfloorpointid = angular.element('#' + dragEl).scope().shopfloorpoint.id;
var shopfloorid = $scope.currentShopfloor.id;
ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "error",

18
admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js
View File

@ -1,8 +1,16 @@
'use strict';
app.controller('ShopfloorSensorController', function ($scope, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) {
app.controller('ShopfloorSensorController', function (
$scope,
$window,
$translate,
ShopfloorService,
SensorService,
ShopfloorSensorService,
toaster,
SweetAlert) {
$scope.currentShopfloor = {selected:undefined};
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSensors = function () {
SensorService.getAllSensors(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -42,7 +50,8 @@ app.controller('ShopfloorSensorController', function ($scope, $translate, Shopfl
$scope.pairSensor = function (dragEl, dropEl) {
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
var shopfloorid = $scope.currentShopfloor.id;
ShopfloorSensorService.addPair(shopfloorid, sensorid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorSensorService.addPair(shopfloorid, sensorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -68,7 +77,8 @@ app.controller('ShopfloorSensorController', function ($scope, $translate, Shopfl
}
var shopfloorsensorid = angular.element('#' + dragEl).scope().shopfloorsensor.id;
var shopfloorid = $scope.currentShopfloor.id;
ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

42
admin/app/controllers/settings/store/store.controller.js
View File

@ -1,7 +1,17 @@
'use strict';
app.controller('StoreController', function($scope,$translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) {
app.controller('StoreController', function(
$scope,
$window,
$translate,
$uibModal,
CostCenterService,
ContactService,
StoreService,
StoreTypeService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllCostCenters = function() {
CostCenterService.getAllCostCenters(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -32,15 +42,16 @@ app.controller('StoreController', function($scope,$translate,$uibModal, CostCent
});
};
$scope.getAllStoreTypes = function() {
StoreTypeService.getAllStoreTypes(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.storetypes = response.data;
} else {
$scope.storetypes = [];
}
});
};
$scope.getAllStoreTypes = function() {
StoreTypeService.getAllStoreTypes(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.storetypes = response.data;
} else {
$scope.storetypes = [];
}
});
};
$scope.addStore = function() {
var modalInstance = $uibModal.open({
templateUrl: 'views/settings/store/store.model.html',
@ -64,7 +75,8 @@ $scope.getAllStoreTypes = function() {
if (angular.isDefined(store.is_input_counted) == false) {
store.is_input_counted = false;
}
StoreService.addStore(store, function(response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreService.addStore(store, headers, function(response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -111,7 +123,8 @@ $scope.getAllStoreTypes = function() {
if (angular.isDefined(store.is_input_counted) == false) {
store.is_input_counted = false;
}
StoreService.editStore(modifiedStore, function(response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreService.editStore(modifiedStore, headers, function(response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -147,7 +160,8 @@ $scope.getAllStoreTypes = function() {
closeOnCancel: true },
function (isConfirm) {
if (isConfirm) {
StoreService.deleteStore(store, function(response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreService.deleteStore(store, headers, function(response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

30
admin/app/controllers/settings/store/storemeter.controller.js
View File

@ -1,21 +1,25 @@
'use strict';
app.controller('StoreMeterController', function($scope,$timeout, $translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
StoreMeterService,
StoreService,
toaster) {
app.controller('StoreMeterController', function(
$scope,
$window,
$timeout,
$translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
StoreMeterService,
StoreService,
toaster) {
$scope.currentStore = {selected:undefined};
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllStores = function(id) {
StoreService.getAllStores(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.stores = response.data;
} else {
} else {
$scope.stores = [];
}
}
});
};
@ -106,7 +110,8 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate,
$scope.pairMeter=function(dragEl,dropEl){
var meterid=angular.element('#'+dragEl).scope().meter.id;
var storeid=$scope.currentStore.id;
StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -133,7 +138,8 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate,
var storemeterid = angular.element('#' + dragEl).scope().storemeter.id;
var storeid = $scope.currentStore.id;
var metertype = angular.element('#' + dragEl).scope().storemeter.metertype;
StoreMeterService.deletePair(storeid, storemeterid, metertype, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreMeterService.deletePair(storeid, storemeterid, metertype, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

16
admin/app/controllers/settings/store/storepoint.controller.js
View File

@ -49,11 +49,11 @@ app.controller('StorePointController', function (
};
$scope.changeStore=function(item,model){
$scope.currentStore=item;
$scope.currentStore.selected=model;
$scope.getPointsByStoreID($scope.currentStore.id);
};
$scope.changeStore=function(item,model){
$scope.currentStore=item;
$scope.currentStore.selected=model;
$scope.getPointsByStoreID($scope.currentStore.id);
};
$scope.changeDataSource = function (item, model) {
$scope.currentDataSource = model;
@ -74,7 +74,8 @@ app.controller('StorePointController', function (
$scope.pairPoint = function (dragEl, dropEl) {
var pointid = angular.element('#' + dragEl).scope().point.id;
var storeid = $scope.currentStore.id;
StorePointService.addPair(storeid, pointid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StorePointService.addPair(storeid, pointid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -100,7 +101,8 @@ app.controller('StorePointController', function (
}
var storepointid = angular.element('#' + dragEl).scope().storepoint.id;
var storeid = $scope.currentStore.id;
StorePointService.deletePair(storeid, storepointid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StorePointService.deletePair(storeid, storepointid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

18
admin/app/controllers/settings/store/storesensor.controller.js
View File

@ -1,8 +1,16 @@
'use strict';
app.controller('StoreSensorController', function ($scope, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) {
app.controller('StoreSensorController', function (
$scope,
$window,
$translate,
StoreService,
SensorService,
StoreSensorService,
toaster,
SweetAlert) {
$scope.currentStore = {selected:undefined};
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSensors = function () {
SensorService.getAllSensors(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -42,7 +50,8 @@ app.controller('StoreSensorController', function ($scope, $translate, StoreServi
$scope.pairSensor = function (dragEl, dropEl) {
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
var storeid = $scope.currentStore.id;
StoreSensorService.addPair(storeid, sensorid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreSensorService.addPair(storeid, sensorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -68,7 +77,8 @@ app.controller('StoreSensorController', function ($scope, $translate, StoreServi
}
var storesensorid = angular.element('#' + dragEl).scope().storesensor.id;
var storeid = $scope.currentStore.id;
StoreSensorService.deletePair(storeid, storesensorid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
StoreSensorService.deletePair(storeid, storesensorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

23
admin/app/controllers/settings/tenant/tenant.controller.js
View File

@ -1,7 +1,17 @@
'use strict';
app.controller('TenantController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) {
app.controller('TenantController', function (
$scope,
$window,
$translate,
$uibModal,
CostCenterService,
ContactService,
TenantService,
TenantTypeService,
toaster,
SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllCostCenters = function () {
CostCenterService.getAllCostCenters(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -70,7 +80,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost
if (angular.isDefined(tenant.is_in_lease) == false) {
tenant.is_in_lease = false;
}
TenantService.addTenant(tenant, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantService.addTenant(tenant, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -123,7 +134,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost
if (angular.isDefined(tenant.is_in_lease) == false) {
tenant.is_in_lease = false;
}
TenantService.editTenant(modifiedTenant, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantService.editTenant(modifiedTenant, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({
type: "success",
@ -160,7 +172,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost
},
function (isConfirm) {
if (isConfirm) {
TenantService.deleteTenant(tenant, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantService.deleteTenant(tenant, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

2
admin/app/controllers/settings/tenant/tenant.master.controller.js
View File

@ -1,8 +1,6 @@
'use strict';
app.controller('TenantMasterController', function($scope) {
$scope.$on('handleEmitTenantChanged', function(event) {
$scope.$broadcast('handleBroadcastTenantChanged');
});

26
admin/app/controllers/settings/tenant/tenantmeter.controller.js
View File

@ -1,14 +1,18 @@
'use strict';
app.controller('TenantMeterController', function($scope,$timeout, $translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
TenantMeterService,
TenantService,
toaster) {
app.controller('TenantMeterController', function(
$scope,
$window,
$timeout,
$translate,
MeterService,
VirtualMeterService,
OfflineMeterService,
TenantMeterService,
TenantService,
toaster) {
$scope.currentTenant = {selected:undefined};
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllTenants = function(id) {
TenantService.getAllTenants(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -106,7 +110,8 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate,
$scope.pairMeter=function(dragEl,dropEl){
var meterid=angular.element('#'+dragEl).scope().meter.id;
var tenantid=$scope.currentTenant.id;
TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -133,7 +138,8 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate,
var tenantmeterid = angular.element('#' + dragEl).scope().tenantmeter.id;
var tenantid = $scope.currentTenant.id;
var metertype = angular.element('#' + dragEl).scope().tenantmeter.metertype;
TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

6
admin/app/controllers/settings/tenant/tenantpoint.controller.js
View File

@ -74,7 +74,8 @@ app.controller('TenantPointController', function (
$scope.pairPoint = function (dragEl, dropEl) {
var pointid = angular.element('#' + dragEl).scope().point.id;
var tenantid = $scope.currentTenant.id;
TenantPointService.addPair(tenantid, pointid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantPointService.addPair(tenantid, pointid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -100,7 +101,8 @@ app.controller('TenantPointController', function (
}
var tenantpointid = angular.element('#' + dragEl).scope().tenantpoint.id;
var tenantid = $scope.currentTenant.id;
TenantPointService.deletePair(tenantid, tenantpointid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantPointService.deletePair(tenantid, tenantpointid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

46
admin/app/controllers/settings/tenant/tenantsensor.controller.js
View File

@ -1,8 +1,16 @@
'use strict';
app.controller('TenantSensorController', function ($scope, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) {
app.controller('TenantSensorController', function (
$scope,
$window,
$translate,
TenantService,
SensorService,
TenantSensorService,
toaster,
SweetAlert) {
$scope.currentTenant = {selected:undefined};
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSensors = function () {
SensorService.getAllSensors(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
@ -23,26 +31,27 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer
});
};
$scope.changeTenant=function(item,model){
$scope.currentTenant=item;
$scope.currentTenant.selected=model;
$scope.getSensorsByTenantID($scope.currentTenant.id);
};
$scope.changeTenant=function(item,model){
$scope.currentTenant=item;
$scope.currentTenant.selected=model;
$scope.getSensorsByTenantID($scope.currentTenant.id);
};
$scope.getAllTenants = function () {
TenantService.getAllTenants(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.tenants = response.data;
} else {
$scope.tenants = [];
}
});
};
$scope.getAllTenants = function () {
TenantService.getAllTenants(function (response) {
if (angular.isDefined(response.status) && response.status === 200) {
$scope.tenants = response.data;
} else {
$scope.tenants = [];
}
});
};
$scope.pairSensor = function (dragEl, dropEl) {
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
var tenantid = $scope.currentTenant.id;
TenantSensorService.addPair(tenantid, sensorid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantSensorService.addPair(tenantid, sensorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({
type: "success",
@ -68,7 +77,8 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer
}
var tenantsensorid = angular.element('#' + dragEl).scope().tenantsensor.id;
var tenantid = $scope.currentTenant.id;
TenantSensorService.deletePair(tenantid, tenantsensorid, function (response) {
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
TenantSensorService.deletePair(tenantid, tenantsensorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({
type: "success",

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

@ -25,24 +25,24 @@ app.factory('ShopfloorService', function($http) {
callback(response);
});
},
addShopfloor: function(shopfloor, callback) {
$http.post(getAPI()+'shopfloors',{data:shopfloor})
addShopfloor: function(shopfloor, headers, callback) {
$http.post(getAPI()+'shopfloors',{data:shopfloor}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editShopfloor: function(shopfloor, callback) {
$http.put(getAPI()+'shopfloors/'+shopfloor.id,{data:shopfloor})
editShopfloor: function(shopfloor, headers, callback) {
$http.put(getAPI()+'shopfloors/'+shopfloor.id,{data:shopfloor}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteShopfloor: function(shopfloor, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloor.id)
deleteShopfloor: function(shopfloor, headers, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloor.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/shopfloor/shopfloorequipment.service.js
View File

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

8
admin/app/services/settings/shopfloor/shopfloormeter.service.js
View File

@ -1,7 +1,7 @@
'use strict';
app.factory('ShopfloorMeterService', function($http) {
return {
addPair: function(shopfloorID,meterID, metertype,callback) {
addPair: function(shopfloorID,meterID, metertype, headers, callback) {
var meter={};
if(metertype=='meters'){
meter={'meter_id':meterID};
@ -11,7 +11,7 @@ app.factory('ShopfloorMeterService', function($http) {
meter={'offline_meter_id':meterID};
}
$http.post(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype,{data:meter})
$http.post(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype,{data:meter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -19,8 +19,8 @@ app.factory('ShopfloorMeterService', function($http) {
});
},
deletePair: function(shopfloorID,meterID, metertype, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype+'/'+meterID)
deletePair: function(shopfloorID,meterID, metertype, headers, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype+'/'+meterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/shopfloor/shopfloorpoint.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('ShopfloorPointService', function($http) {
return {
addPair: function(shopfloorID,pointID,callback) {
$http.post(getAPI()+'shopfloors/'+shopfloorID+'/points',{data:{'point_id':pointID}})
addPair: function(shopfloorID,pointID, headers, callback) {
$http.post(getAPI()+'shopfloors/'+shopfloorID+'/points',{data:{'point_id':pointID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('ShopfloorPointService', function($http) {
});
},
deletePair: function(shopfloorID,pointID, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloorID+'/points/'+pointID)
deletePair: function(shopfloorID,pointID, headers, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloorID+'/points/'+pointID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/shopfloor/shopfloorsensor.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('ShopfloorSensorService', function($http) {
return {
addPair: function(shopfloorID,sensorID,callback) {
$http.post(getAPI()+'shopfloors/'+shopfloorID+'/sensors',{data:{'sensor_id':sensorID}})
addPair: function(shopfloorID,sensorID, headers, callback) {
$http.post(getAPI()+'shopfloors/'+shopfloorID+'/sensors',{data:{'sensor_id':sensorID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('ShopfloorSensorService', function($http) {
});
},
deletePair: function(shopfloorID,sensorID, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloorID+'/sensors/'+sensorID)
deletePair: function(shopfloorID,sensorID, headers, callback) {
$http.delete(getAPI()+'shopfloors/'+shopfloorID+'/sensors/'+sensorID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

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

@ -17,24 +17,24 @@ app.factory('StoreService', function($http) {
callback(response);
});
},
addStore: function(store, callback) {
$http.post(getAPI()+'stores',{data:store})
addStore: function(store, headers, callback) {
$http.post(getAPI()+'stores',{data:store}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editStore: function(store, callback) {
$http.put(getAPI()+'stores/'+store.id,{data:store})
editStore: function(store, headers, callback) {
$http.put(getAPI()+'stores/'+store.id,{data:store}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteStore: function(store, callback) {
$http.delete(getAPI()+'stores/'+store.id)
deleteStore: function(store, headers, callback) {
$http.delete(getAPI()+'stores/'+store.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/store/storemeter.service.js
View File

@ -1,7 +1,7 @@
'use strict';
app.factory('StoreMeterService', function($http) {
return {
addPair: function(storeID, meterID, metertype,callback) {
addPair: function(storeID, meterID, metertype, headers, callback) {
var meter={};
if(metertype=='meters'){
meter={'meter_id':meterID};
@ -11,7 +11,7 @@ app.factory('StoreMeterService', function($http) {
meter={'offline_meter_id':meterID};
}
$http.post(getAPI()+'stores/'+storeID+'/'+metertype,{data:meter})
$http.post(getAPI()+'stores/'+storeID+'/'+metertype,{data:meter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -19,8 +19,8 @@ app.factory('StoreMeterService', function($http) {
});
},
deletePair: function(storeID, meterID, metertype, callback) {
$http.delete(getAPI()+'stores/'+storeID+'/'+metertype+'/'+meterID)
deletePair: function(storeID, meterID, metertype, headers, callback) {
$http.delete(getAPI()+'stores/'+storeID+'/'+metertype+'/'+meterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/store/storepoint.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('StorePointService', function($http) {
return {
addPair: function(storeID,pointID,callback) {
$http.post(getAPI()+'stores/'+storeID+'/points',{data:{'point_id':pointID}})
addPair: function(storeID,pointID, headers, callback) {
$http.post(getAPI()+'stores/'+storeID+'/points',{data:{'point_id':pointID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('StorePointService', function($http) {
});
},
deletePair: function(storeID,pointID, callback) {
$http.delete(getAPI()+'stores/'+storeID+'/points/'+pointID)
deletePair: function(storeID,pointID, headers, callback) {
$http.delete(getAPI()+'stores/'+storeID+'/points/'+pointID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/store/storesensor.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('StoreSensorService', function($http) {
return {
addPair: function(storeID,sensorID,callback) {
$http.post(getAPI()+'stores/'+storeID+'/sensors',{data:{'sensor_id':sensorID}})
addPair: function(storeID,sensorID, headers, callback) {
$http.post(getAPI()+'stores/'+storeID+'/sensors',{data:{'sensor_id':sensorID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('StoreSensorService', function($http) {
});
},
deletePair: function(storeID,sensorID, callback) {
$http.delete(getAPI()+'stores/'+storeID+'/sensors/'+sensorID)
deletePair: function(storeID,sensorID, headers, callback) {
$http.delete(getAPI()+'stores/'+storeID+'/sensors/'+sensorID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

12
admin/app/services/settings/store/storetype.service.js
View File

@ -17,24 +17,24 @@ app.factory('StoreTypeService', function($http) {
callback(response);
});
},
addStoreType: function(store_type, callback) {
$http.post(getAPI()+'storetypes',{data:store})
addStoreType: function(store_type, headers, callback) {
$http.post(getAPI()+'storetypes',{data:store}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editStoreType: function(store_type, callback) {
$http.put(getAPI()+'storetypes/'+store_type.id,{data:store_type})
editStoreType: function(store_type, headers, callback) {
$http.put(getAPI()+'storetypes/'+store_type.id,{data:store_type}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteStoreType: function(store_type, callback) {
$http.delete(getAPI()+'storetypes/'+store_type.id)
deleteStoreType: function(store_type, headers, callback) {
$http.delete(getAPI()+'storetypes/'+store_type.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

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

@ -17,24 +17,24 @@ app.factory('TenantService', function($http) {
callback(response);
});
},
addTenant: function(tenant, callback) {
$http.post(getAPI()+'tenants',{data:tenant})
addTenant: function(tenant, headers, callback) {
$http.post(getAPI()+'tenants',{data:tenant}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editTenant: function(tenant, callback) {
$http.put(getAPI()+'tenants/'+tenant.id,{data:tenant})
editTenant: function(tenant, headers, callback) {
$http.put(getAPI()+'tenants/'+tenant.id,{data:tenant}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteTenant: function(tenant, callback) {
$http.delete(getAPI()+'tenants/'+tenant.id)
deleteTenant: function(tenant, headers, callback) {
$http.delete(getAPI()+'tenants/'+tenant.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/tenant/tenantmeter.service.js
View File

@ -1,7 +1,7 @@
'use strict';
app.factory('TenantMeterService', function($http) {
return {
addPair: function(tenantID, meterID, metertype,callback) {
addPair: function(tenantID, meterID, metertype, headers, callback) {
var meter={};
if(metertype=='meters'){
meter={'meter_id':meterID};
@ -11,7 +11,7 @@ app.factory('TenantMeterService', function($http) {
meter={'offline_meter_id':meterID};
}
$http.post(getAPI()+'tenants/'+tenantID+'/'+metertype,{data:meter})
$http.post(getAPI()+'tenants/'+tenantID+'/'+metertype,{data:meter}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -19,8 +19,8 @@ app.factory('TenantMeterService', function($http) {
});
},
deletePair: function(tenantID, meterID, metertype, callback) {
$http.delete(getAPI()+'tenants/'+tenantID+'/'+metertype+'/'+meterID)
deletePair: function(tenantID, meterID, metertype, headers, callback) {
$http.delete(getAPI()+'tenants/'+tenantID+'/'+metertype+'/'+meterID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/tenant/tenantpoint.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('TenantPointService', function($http) {
return {
addPair: function(tenantID,pointID,callback) {
$http.post(getAPI()+'tenants/'+tenantID+'/points',{data:{'point_id':pointID}})
addPair: function(tenantID,pointID, headers, callback) {
$http.post(getAPI()+'tenants/'+tenantID+'/points',{data:{'point_id':pointID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('TenantPointService', function($http) {
});
},
deletePair: function(tenantID,pointID, callback) {
$http.delete(getAPI()+'tenants/'+tenantID+'/points/'+pointID)
deletePair: function(tenantID,pointID, headers, callback) {
$http.delete(getAPI()+'tenants/'+tenantID+'/points/'+pointID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

8
admin/app/services/settings/tenant/tenantsensor.service.js
View File

@ -1,8 +1,8 @@
'use strict';
app.factory('TenantSensorService', function($http) {
return {
addPair: function(tenantID,sensorID,callback) {
$http.post(getAPI()+'tenants/'+tenantID+'/sensors',{data:{'sensor_id':sensorID}})
addPair: function(tenantID,sensorID, headers, callback) {
$http.post(getAPI()+'tenants/'+tenantID+'/sensors',{data:{'sensor_id':sensorID}}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
@ -10,8 +10,8 @@ app.factory('TenantSensorService', function($http) {
});
},
deletePair: function(tenantID,sensorID, callback) {
$http.delete(getAPI()+'tenants/'+tenantID+'/sensors/'+sensorID)
deletePair: function(tenantID,sensorID, headers, callback) {
$http.delete(getAPI()+'tenants/'+tenantID+'/sensors/'+sensorID, {headers})
.then(function (response) {
callback(response);
}, function (response) {

12
admin/app/services/settings/tenant/tenanttype.service.js
View File

@ -17,24 +17,24 @@ app.factory('TenantTypeService', function($http) {
callback(response);
});
},
addTenantType: function(tenant_type, callback) {
$http.post(getAPI()+'tenanttypes',{data:tenant})
addTenantType: function(tenant_type, headers, callback) {
$http.post(getAPI()+'tenanttypes',{data:tenant}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
editTenantType: function(tenant_type, callback) {
$http.put(getAPI()+'tenanttypes/'+tenant_type.id,{data:tenant_type})
editTenantType: function(tenant_type, headers, callback) {
$http.put(getAPI()+'tenanttypes/'+tenant_type.id,{data:tenant_type}, {headers})
.then(function (response) {
callback(response);
}, function (response) {
callback(response);
});
},
deleteTenantType: function(tenant_type, callback) {
$http.delete(getAPI()+'tenanttypes/'+tenant_type.id)
deleteTenantType: function(tenant_type, headers, callback) {
$http.delete(getAPI()+'tenanttypes/'+tenant_type.id, {headers})
.then(function (response) {
callback(response);
}, function (response) {

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

@ -5401,7 +5401,18 @@
"name": "POST Create New Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMS Shopfloor2\", \"area\":999.99, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Shopfloor description\"}}"
@ -5422,19 +5433,30 @@
"name": "PUT Update a Shopfloor",
"request": {
"method": "PUT",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"MyEMS Shopfloor2\", \"area\":999.99, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Shopfloor description\"}}"
},
"url": {
"raw": "{{base_url}}/shopfloors/2",
"raw": "{{base_url}}/shopfloors/3",
"host": [
"{{base_url}}"
],
"path": [
"shopfloors",
"2"
"3"
]
}
},
@ -5444,7 +5466,18 @@
"name": "DELETE a Shopfloor by ID",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/2",
"host": [
@ -5481,7 +5514,18 @@
"name": "POST Bind an Equipment to a Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"equipment_id\":1}}"
@ -5504,7 +5548,18 @@
"name": "DELETE an Equipment from Shopfloor",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/1/equipments/1",
"host": [
@ -5543,7 +5598,18 @@
"name": "POST Bind a Meter to a Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"meter_id\":1}}"
@ -5566,7 +5632,18 @@
"name": "DELETE a Meter from Shopfloor",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/1/meters/1",
"host": [
@ -5605,7 +5682,18 @@
"name": "POST Bind an OfflineMeter to a Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"offline_meter_id\":1}}"
@ -5628,7 +5716,18 @@
"name": "DELETE an Offline Meter from Shopfloor",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/1/offlinemeters/1",
"host": [
@ -5667,7 +5766,18 @@
"name": "POST Bind a Point to a Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"point_id\":1}}"
@ -5690,7 +5800,18 @@
"name": "DELETE a Point from Shopfloor",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/1/points/1",
"host": [
@ -5729,7 +5850,18 @@
"name": "POST Bind a Sensor to a Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"sensor_id\":1}}"
@ -5752,7 +5884,18 @@
"name": "DELETE a Sensor from Shopfloor",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/1/sensors/1",
"host": [
@ -5791,7 +5934,18 @@
"name": "POST Bind a Virtual Meter to a Shopfloor",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"virtual_meter_id\":1}}"
@ -5814,7 +5968,18 @@
"name": "DELETE a Virtual Meter from Shopfloor",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/shopfloors/1/virtualmeters/1",
"host": [
@ -6643,7 +6808,18 @@
"name": "POST Create New Store",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"麦当劳(新王府井店)\", \"address\":\"北京市东城区王府井大街200号工美大厦1层010-65120499\", \"latitude\":39.909429, \"longitude\":116.416993, \"area\":600.000, \"store_type_id\":1, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Classic, long-running fast-food chain known for its burgers, fries & shakes.\"}}"
@ -6664,19 +6840,30 @@
"name": "PUT Update a Store",
"request": {
"method": "PUT",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"麦当劳(新王府井店)\", \"address\":\"北京市东城区王府井大街200号工美大厦1层010-65120499\", \"latitude\":39.909429, \"longitude\":116.416993, \"area\":600.000, \"store_type_id\":1, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Classic, long-running fast-food chain known for its burgers, fries & shakes.\"}}"
},
"url": {
"raw": "{{base_url}}/stores/2",
"raw": "{{base_url}}/stores/3",
"host": [
"{{base_url}}"
],
"path": [
"stores",
"2"
"3"
]
}
},
@ -6686,15 +6873,26 @@
"name": "DELETE a Store by ID",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/stores/2",
"raw": "{{base_url}}/stores/3",
"host": [
"{{base_url}}"
],
"path": [
"stores",
"2"
"3"
]
}
},
@ -6723,7 +6921,18 @@
"name": "POST Bind a Meter to a Store",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"meter_id\":1}}"
@ -6746,7 +6955,18 @@
"name": "DELETE a Meter from Store",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/stores/1/meters/1",
"host": [
@ -6785,7 +7005,18 @@
"name": "POST Bind an OfflineMeter to a Store",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"offline_meter_id\":1}}"
@ -6808,7 +7039,18 @@
"name": "DELETE an Offline Meter from Store",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/stores/1/offlinemeters/1",
"host": [
@ -6847,7 +7089,18 @@
"name": "POST Bind a Point to a Store",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"point_id\":1}}"
@ -6870,7 +7123,18 @@
"name": "DELETE a Point from Store",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/stores/1/points/1",
"host": [
@ -6909,7 +7173,18 @@
"name": "POST Bind a Sensor to a Store",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"sensor_id\":1}}"
@ -6932,7 +7207,18 @@
"name": "DELETE a Sensor from Stores",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/stores/1/sensors/1",
"host": [
@ -6971,7 +7257,18 @@
"name": "POST Bind a Virtual Meter to a Store",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"virtual_meter_id\":1}}"
@ -6994,7 +7291,18 @@
"name": "DELETE a Virtual Meter from Store",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/stores/1/virtualmeters/1",
"host": [
@ -7332,7 +7640,18 @@
"name": "POST Create New Tenant",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"Starbucks\", \"buildings\":\"Building #1\", \"floors\":\"L1 L2 L3\", \"rooms\":\"1201b+2247+3F\", \"area\":418.8, \"tenant_type_id\":9, \"is_input_counted\":true, \"is_key_tenant\":true,\n\"lease_number\":\"6b0da806\", \"lease_start_datetime\":\"2021-01-01T00:00:00\", \"lease_end_datetime\":\"2022-01-01T00:00:00\", \"is_in_lease\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"my description\"}}"
@ -7353,7 +7672,18 @@
"name": "PUT Update a Tenant",
"request": {
"method": "PUT",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"name\":\"Hermes 爱马仕\", \"buildings\":\"Building #1\", \"floors\":\"L1 L2 L3 L4 L5\", \"rooms\":\"1201b+2247+3F\", \"area\":818.8, \"tenant_type_id\":9, \"is_input_counted\":true, \"is_key_tenant\":true,\n\"lease_number\":\"6b0da806\", \"lease_start_datetime_utc\":\"2021-01-01T00:00:00\", \"lease_end_datetime_utc\":\"2022-01-01T00:00:00\", \"is_in_lease\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"my description\"}}"
@ -7375,9 +7705,27 @@
"name": "DELETE a Tenant by ID",
"request": {
"method": "GET",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": ""
"raw": "{{base_url}}/tenants/2",
"host": [
"{{base_url}}"
],
"path": [
"tenants",
"2"
]
}
},
"response": []
@ -7405,7 +7753,18 @@
"name": "POST Bind a Meter to a Tenant",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"meter_id\":1}}"
@ -7428,7 +7787,18 @@
"name": "DELETE a Meter from Tenant",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/tenants/1/meters/1",
"host": [
@ -7467,7 +7837,18 @@
"name": "POST Bind an OfflineMeter to a Tenant",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"offline_meter_id\":1}}"
@ -7490,7 +7871,18 @@
"name": "DELETE an Offline Meter from Tenant",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/tenants/1/offlinemeters/1",
"host": [
@ -7529,7 +7921,18 @@
"name": "POST Bind a Point to a Tenant",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"point_id\":1}}"
@ -7552,7 +7955,18 @@
"name": "DELETE a Point from Tenant",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/tenants/1/points/1",
"host": [
@ -7591,7 +8005,18 @@
"name": "POST Bind a Sensor to a Tenant",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"sensor_id\":1}}"
@ -7614,7 +8039,18 @@
"name": "DELETE a Sensor from Tenant",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/tenants/1/sensors/1",
"host": [
@ -7653,7 +8089,18 @@
"name": "POST Bind a Virtual Meter to a Tenant",
"request": {
"method": "POST",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"body": {
"mode": "raw",
"raw": "{\"data\":{\"virtual_meter_id\":1}}"
@ -7676,7 +8123,18 @@
"name": "DELETE a Virtual Meter from Tenant",
"request": {
"method": "DELETE",
"header": [],
"header": [
{
"key": "User-UUID",
"value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4",
"type": "text"
},
{
"key": "Token",
"value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0",
"type": "text"
}
],
"url": {
"raw": "{{base_url}}/tenants/1/virtualmeters/1",
"host": [

17
myems-api/core/shopfloor.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 ShopfloorCollection:
@ -88,6 +88,7 @@ class ShopfloorCollection:
@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:
@ -279,6 +280,7 @@ class ShopfloorItem:
@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_SHOPFLOOR_ID')
@ -400,6 +402,7 @@ class ShopfloorItem:
@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:
@ -566,6 +569,7 @@ class ShopfloorEquipmentCollection:
@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 +644,7 @@ class ShopfloorEquipmentItem:
@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_SHOPFLOOR_ID')
@ -749,6 +754,7 @@ class ShopfloorMeterCollection:
@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:
@ -823,6 +829,7 @@ class ShopfloorMeterItem:
@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_SHOPFLOOR_ID')
@ -931,6 +938,7 @@ class ShopfloorOfflineMeterCollection:
@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:
@ -1005,6 +1013,7 @@ class ShopfloorOfflineMeterItem:
@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_SHOPFLOOR_ID')
@ -1113,6 +1122,7 @@ class ShopfloorPointCollection:
@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:
@ -1187,6 +1197,7 @@ class ShopfloorPointItem:
@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_SHOPFLOOR_ID')
@ -1282,6 +1293,7 @@ class ShopfloorSensorCollection:
@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:
@ -1356,6 +1368,7 @@ class ShopfloorSensorItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, sid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SHOPFLOOR_ID')
@ -1464,6 +1477,7 @@ class ShopfloorVirtualMeterCollection:
@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:
@ -1538,6 +1552,7 @@ class ShopfloorVirtualMeterItem:
@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_SHOPFLOOR_ID')

15
myems-api/core/store.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 StoreCollection:
@ -94,6 +94,7 @@ class StoreCollection:
@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:
@ -335,6 +336,7 @@ class StoreItem:
@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_STORE_ID')
@ -440,6 +442,7 @@ class StoreItem:
@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:
@ -664,6 +667,7 @@ class StoreMeterCollection:
@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:
@ -738,6 +742,7 @@ class StoreMeterItem:
@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_STORE_ID')
@ -846,6 +851,7 @@ class StoreOfflineMeterCollection:
@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:
@ -920,6 +926,7 @@ class StoreOfflineMeterItem:
@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_STORE_ID')
@ -1028,6 +1035,7 @@ class StorePointCollection:
@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:
@ -1102,6 +1110,7 @@ class StorePointItem:
@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_STORE_ID')
@ -1197,6 +1206,7 @@ class StoreSensorCollection:
@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:
@ -1271,6 +1281,7 @@ class StoreSensorItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, sid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_STORE_ID')
@ -1379,6 +1390,7 @@ class StoreVirtualMeterCollection:
@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:
@ -1453,6 +1465,7 @@ class StoreVirtualMeterItem:
@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_STORE_ID')

15
myems-api/core/tenant.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 TenantCollection:
@ -111,6 +111,7 @@ class TenantCollection:
@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:
@ -402,6 +403,7 @@ class TenantItem:
@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_TENANT_ID')
@ -507,6 +509,7 @@ class TenantItem:
@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:
@ -767,6 +770,7 @@ class TenantMeterCollection:
@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:
@ -841,6 +845,7 @@ class TenantMeterItem:
@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_TENANT_ID')
@ -949,6 +954,7 @@ class TenantOfflineMeterCollection:
@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:
@ -1023,6 +1029,7 @@ class TenantOfflineMeterItem:
@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_TENANT_ID')
@ -1131,6 +1138,7 @@ class TenantPointCollection:
@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:
@ -1205,6 +1213,7 @@ class TenantPointItem:
@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_TENANT_ID')
@ -1300,6 +1309,7 @@ class TenantSensorCollection:
@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:
@ -1374,6 +1384,7 @@ class TenantSensorItem:
@staticmethod
@user_logger
def on_delete(req, resp, id_, sid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_TENANT_ID')
@ -1482,6 +1493,7 @@ class TenantVirtualMeterCollection:
@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:
@ -1556,6 +1568,7 @@ class TenantVirtualMeterItem:
@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_TENANT_ID')

2
web/Dockerfile vendored
View File

@ -1,4 +1,4 @@
FROM nginx:1.21.1
FROM nginx:1.21.4
# remove the default config
RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf