Merge branch 'develop'

MyEMS · Dec 17, 2023 · b8dc92a · b8dc92a
2 parents 25b921a + fcc0923
commit b8dc92a
Show file tree

Hide file tree

Showing 29 changed files with 4,549 additions and 5,347 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,7 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - changed microgrid monitoring in myems-web
 - changed Related Parameters to Operating Characteristic Curve in myems-web
 ### Fixed
--
+- fixed non-standard actions of microgrid in myems-api and myems-admin
+- 
 ### Removed
 -
 

diff --git a/database/upgrade/upgrade4.0.0RC.sql b/database/upgrade/upgrade4.0.0RC.sql
@@ -6,7 +6,6 @@
 
 START TRANSACTION;
 
-
 CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_energy_storage_power_stations_batteries` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` VARCHAR(255) NOT NULL,
@@ -83,11 +82,6 @@ CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_energy_storage_power_stations_
   PRIMARY KEY (`id`));
 CREATE INDEX `tbl_energy_storage_power_stations_grids_index_1` ON  `myems_system_db`.`tbl_energy_storage_power_stations_grids` (`name`);
 
--- ---------------------------------------------------------------------------------------------------------------------
--- Table `myems_system_db`.`tbl_energy_storage_power_stations_loads`
--- ---------------------------------------------------------------------------------------------------------------------
-DROP TABLE IF EXISTS `myems_system_db`.`tbl_energy_storage_power_stations_loads` ;
-
 CREATE TABLE IF NOT EXISTS `myems_system_db`.`tbl_energy_storage_power_stations_loads` (
   `id` BIGINT NOT NULL AUTO_INCREMENT,
   `name` VARCHAR(255) NOT NULL,

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridbattery.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridbattery.controller.js
@@ -85,14 +85,13 @@ app.controller('MicrogridBatteryController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridbattery) {
-        	microgridbattery.microgrid_id = $scope.currentMicrogrid.id;
-			microgridbattery.battery_state_point_id = microgridbattery.battery_state_point.id;
+        	microgridbattery.battery_state_point_id = microgridbattery.battery_state_point.id;
 			microgridbattery.soc_point_id = microgridbattery.soc_point.id;
 			microgridbattery.power_point_id = microgridbattery.power_point.id;
 			microgridbattery.charge_meter_id = microgridbattery.charge_meter.id;
 			microgridbattery.discharge_meter_id = microgridbattery.discharge_meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridBatteryService.addMicrogridBattery(microgridbattery, headers, function (response) {
+  			MicrogridBatteryService.addMicrogridBattery($scope.currentMicrogrid.id, microgridbattery, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -134,14 +133,13 @@ app.controller('MicrogridBatteryController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridBattery) {
-        	modifiedMicrogridBattery.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridBattery.battery_state_point_id = modifiedMicrogridBattery.battery_state_point.id;
 			modifiedMicrogridBattery.soc_point_id = modifiedMicrogridBattery.soc_point.id;
 			modifiedMicrogridBattery.power_point_id = modifiedMicrogridBattery.power_point.id;
 			modifiedMicrogridBattery.charge_meter_id = modifiedMicrogridBattery.charge_meter.id;
 			modifiedMicrogridBattery.discharge_meter_id = modifiedMicrogridBattery.discharge_meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridBatteryService.editMicrogridBattery(modifiedMicrogridBattery, headers, function (response) {
+  			MicrogridBatteryService.editMicrogridBattery($scope.currentMicrogrid.id, modifiedMicrogridBattery, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -181,7 +179,7 @@ app.controller('MicrogridBatteryController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridBatteryService.deleteMicrogridBattery(microgridbattery.id, headers, function (response) {
+  					MicrogridBatteryService.deleteMicrogridBattery($scope.currentMicrogrid.id, microgridbattery.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridevcharger.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridevcharger.controller.js
@@ -83,11 +83,10 @@ app.controller('MicrogridEVChargerController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridevcharger) {
-        	microgridevcharger.microgrid_id = $scope.currentMicrogrid.id;
 			microgridevcharger.power_point_id = microgridevcharger.power_point.id;
 			microgridevcharger.meter_id = microgridevcharger.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridEVChargerService.addMicrogridEVCharger(microgridevcharger, headers, function (response) {
+  			MicrogridEVChargerService.addMicrogridEVCharger($scope.currentMicrogrid.id, microgridevcharger, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -129,11 +128,10 @@ app.controller('MicrogridEVChargerController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridEVCharger) {
-        	modifiedMicrogridEVCharger.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridEVCharger.power_point_id = modifiedMicrogridEVCharger.power_point.id;
 			modifiedMicrogridEVCharger.meter_id = modifiedMicrogridEVCharger.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridEVChargerService.editMicrogridEVCharger(modifiedMicrogridEVCharger, headers, function (response) {
+  			MicrogridEVChargerService.editMicrogridEVCharger($scope.currentMicrogrid.id, modifiedMicrogridEVCharger, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -173,7 +171,7 @@ app.controller('MicrogridEVChargerController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridEVChargerService.deleteMicrogridEVCharger(microgridevcharger.id, headers, function (response) {
+  					MicrogridEVChargerService.deleteMicrogridEVCharger($scope.currentMicrogrid.id, microgridevcharger.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridgenerator.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridgenerator.controller.js
@@ -83,11 +83,10 @@ app.controller('MicrogridGeneratorController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridgenerator) {
-       		microgridgenerator.microgrid_id = $scope.currentMicrogrid.id;
 			microgridgenerator.power_point_id = microgridgenerator.power_point.id;
 			microgridgenerator.meter_id = microgridgenerator.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridGeneratorService.addMicrogridGenerator(microgridgenerator, headers, function (response) {
+  			MicrogridGeneratorService.addMicrogridGenerator($scope.currentMicrogrid.id, microgridgenerator, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -129,11 +128,10 @@ app.controller('MicrogridGeneratorController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridGenerator) {
-            modifiedMicrogridGenerator.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridGenerator.power_point_id = modifiedMicrogridGenerator.power_point.id;
 			modifiedMicrogridGenerator.meter_id = modifiedMicrogridGenerator.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridGeneratorService.editMicrogridGenerator(modifiedMicrogridGenerator, headers, function (response) {
+  			MicrogridGeneratorService.editMicrogridGenerator($scope.currentMicrogrid.id, modifiedMicrogridGenerator, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -173,7 +171,7 @@ app.controller('MicrogridGeneratorController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridGeneratorService.deleteMicrogridGenerator(microgridgenerator.id, headers, function (response) {
+  					MicrogridGeneratorService.deleteMicrogridGenerator($scope.currentMicrogrid.id, microgridgenerator.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridgrid.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridgrid.controller.js
@@ -84,12 +84,11 @@ app.controller('MicrogridGridController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridgrid) {
-            microgridgrid.microgrid_id = $scope.currentMicrogrid.id;
 			microgridgrid.power_point_id = microgridgrid.power_point.id;
 			microgridgrid.buy_meter_id = microgridgrid.buy_meter.id;
 			microgridgrid.sell_meter_id = microgridgrid.sell_meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridGridService.addMicrogridGrid(microgridgrid, headers, function (response) {
+  			MicrogridGridService.addMicrogridGrid($scope.currentMicrogrid.id, microgridgrid, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -131,12 +130,11 @@ app.controller('MicrogridGridController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridGrid) {
-            modifiedMicrogridGrid.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridGrid.power_point_id = modifiedMicrogridGrid.power_point.id;
 			modifiedMicrogridGrid.buy_meter_id = modifiedMicrogridGrid.buy_meter.id;
 			modifiedMicrogridGrid.sell_meter_id = modifiedMicrogridGrid.sell_meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridGridService.editMicrogridGrid(modifiedMicrogridGrid, headers, function (response) {
+  			MicrogridGridService.editMicrogridGrid($scope.currentMicrogrid.id, modifiedMicrogridGrid, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -176,7 +174,7 @@ app.controller('MicrogridGridController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridGridService.deleteMicrogridGrid(microgridgrid.id, headers, function (response) {
+  					MicrogridGridService.deleteMicrogridGrid($scope.currentMicrogrid.id, microgridgrid.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridheatpump.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridheatpump.controller.js
@@ -84,13 +84,12 @@ app.controller('MicrogridHeatpumpController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridheatpump) {
-       		microgridheatpump.microgrid_id = $scope.currentMicrogrid.id;
 			microgridheatpump.power_point_id = microgridheatpump.power_point.id;
 			microgridheatpump.electricity_meter_id = microgridheatpump.electricity_meter.id;
 			microgridheatpump.heat_meter_id = microgridheatpump.heat_meter.id;
 			microgridheatpump.cooling_meter_id = microgridheatpump.cooling_meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridHeatpumpService.addMicrogridHeatpump(microgridheatpump, headers, function (response) {
+  			MicrogridHeatpumpService.addMicrogridHeatpump($scope.currentMicrogrid.id, microgridheatpump, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -132,13 +131,12 @@ app.controller('MicrogridHeatpumpController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridHeatpump) {
-        	modifiedMicrogridHeatpump.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridHeatpump.power_point_id = modifiedMicrogridHeatpump.power_point.id;
 			modifiedMicrogridHeatpump.electricity_meter_id = modifiedMicrogridHeatpump.electricity_meter.id;
 			modifiedMicrogridHeatpump.heat_meter_id = modifiedMicrogridHeatpump.heat_meter.id;
 			modifiedMicrogridHeatpump.cooling_meter_id = modifiedMicrogridHeatpump.cooling_meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridHeatpumpService.editMicrogridHeatpump(modifiedMicrogridHeatpump, headers, function (response) {
+  			MicrogridHeatpumpService.editMicrogridHeatpump($scope.currentMicrogrid.id, modifiedMicrogridHeatpump, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -178,7 +176,7 @@ app.controller('MicrogridHeatpumpController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridHeatpumpService.deleteMicrogridHeatpump(microgridheatpump.id, headers, function (response) {
+  					MicrogridHeatpumpService.deleteMicrogridHeatpump($scope.currentMicrogrid.id, microgridheatpump.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridload.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridload.controller.js
@@ -83,11 +83,10 @@ app.controller('MicrogridLoadController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridload) {
-        	microgridload.microgrid_id = $scope.currentMicrogrid.id;
 			microgridload.power_point_id = microgridload.power_point.id;
 			microgridload.meter_id = microgridload.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridLoadService.addMicrogridLoad(microgridload, headers, function (response) {
+  			MicrogridLoadService.addMicrogridLoad($scope.currentMicrogrid.id, microgridload, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -129,11 +128,10 @@ app.controller('MicrogridLoadController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridLoad) {
-       		modifiedMicrogridLoad.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridLoad.power_point_id = modifiedMicrogridLoad.power_point.id;
 			modifiedMicrogridLoad.meter_id = modifiedMicrogridLoad.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridLoadService.editMicrogridLoad(modifiedMicrogridLoad, headers, function (response) {
+  			MicrogridLoadService.editMicrogridLoad($scope.currentMicrogrid.id, modifiedMicrogridLoad, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -173,7 +171,7 @@ app.controller('MicrogridLoadController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridLoadService.deleteMicrogridLoad(microgridload.id, headers, function (response) {
+  					MicrogridLoadService.deleteMicrogridLoad($scope.currentMicrogrid.id, microgridload.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",

diff --git a/myems-admin/app/controllers/settings/microgrid/microgridphotovoltaic.controller.js b/myems-admin/app/controllers/settings/microgrid/microgridphotovoltaic.controller.js
@@ -84,11 +84,10 @@ app.controller('MicrogridPhotovoltaicController', function(
   			}
   		});
   		modalInstance.result.then(function(microgridphotovoltaic) {
-        	microgridphotovoltaic.microgrid_id = $scope.currentMicrogrid.id;
 			microgridphotovoltaic.power_point_id = microgridphotovoltaic.power_point.id;
 			microgridphotovoltaic.meter_id = microgridphotovoltaic.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridPhotovoltaicService.addMicrogridPhotovoltaic(microgridphotovoltaic, headers, function (response) {
+  			MicrogridPhotovoltaicService.addMicrogridPhotovoltaic($scope.currentMicrogrid.id, microgridphotovoltaic, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 201) {
   					toaster.pop({
   						type: "success",
@@ -130,11 +129,10 @@ app.controller('MicrogridPhotovoltaicController', function(
   		});
 
   		modalInstance.result.then(function(modifiedMicrogridPhotovoltaic) {
-        	modifiedMicrogridPhotovoltaic.microgrid_id = $scope.currentMicrogrid.id;
 			modifiedMicrogridPhotovoltaic.power_point_id = modifiedMicrogridPhotovoltaic.power_point.id;
 			modifiedMicrogridPhotovoltaic.meter_id = modifiedMicrogridPhotovoltaic.meter.id;
 			let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  			MicrogridPhotovoltaicService.editMicrogridPhotovoltaic(modifiedMicrogridPhotovoltaic, headers, function (response) {
+  			MicrogridPhotovoltaicService.editMicrogridPhotovoltaic($scope.currentMicrogrid.id, modifiedMicrogridPhotovoltaic, headers, function (response) {
   				if (angular.isDefined(response.status) && response.status === 200) {
   					toaster.pop({
   						type: "success",
@@ -174,7 +172,7 @@ app.controller('MicrogridPhotovoltaicController', function(
   			function(isConfirm) {
   				if (isConfirm) {
 					let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-  					MicrogridPhotovoltaicService.deleteMicrogridPhotovoltaic(microgridphotovoltaic.id, headers, function (response) {
+  					MicrogridPhotovoltaicService.deleteMicrogridPhotovoltaic($scope.currentMicrogrid.id, microgridphotovoltaic.id, headers, function (response) {
   						if (angular.isDefined(response.status) && response.status === 204) {
 							toaster.pop({
 								type: "success",