Merge branch 'develop'

MyEMS · Dec 21, 2023 · 6145289 · 6145289
2 parents 5d064bf + 1be3b30
commit 6145289
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ 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
 - changed MultiTrendChart in myems-web
+- updated demo tariffs in database
 ### Fixed
 - fixed non-standard actions of microgrid in myems-api and myems-admin
 - 

diff --git a/database/demo-cn/myems_system_db.sql b/database/demo-cn/myems_system_db.sql
@@ -756,9 +756,9 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_tariffs`
 (`id`, `name`, `uuid`, `energy_category_id`, `tariff_type`, `unit_of_price`, `valid_from_datetime_utc`, `valid_through_datetime_utc`)
 VALUES
-(1, '2020分时电价1-6',    '590efb36-8587-42a9-ae6f-c715d21496d6', 1, 'timeofuse', '元/千瓦时', '2019-12-31 16:00:00', '2020-06-30 15:59:59'),
-(2, '2020分时电价7-9',    'f5966640-18fc-437a-9efd-cbc0c58b6373', 1, 'timeofuse', '元/千瓦时', '2020-06-30 16:00:00', '2020-09-30 15:59:59'),
-(3, '2020分时电价10-12',  '21727a1b-4b27-4186-b72e-db46e6e2d980', 1, 'timeofuse', '元/千瓦时', '2020-09-30 16:00:00', '2020-12-31 15:59:59'),
+(1, '2024分时电价1-6',    '590efb36-8587-42a9-ae6f-c715d21496d6', 1, 'timeofuse', '元/千瓦时', '2023-12-31 16:00:00', '2024-06-30 15:59:59'),
+(2, '2024分时电价7-9',    'f5966640-18fc-437a-9efd-cbc0c58b6373', 1, 'timeofuse', '元/千瓦时', '2024-06-30 16:00:00', '2024-09-30 15:59:59'),
+(3, '2024分时电价10-12',  '21727a1b-4b27-4186-b72e-db46e6e2d980', 1, 'timeofuse', '元/千瓦时', '2024-09-30 16:00:00', '2024-12-31 15:59:59'),
 (4, '2021分时电价1-6',    'fe65e443-0ec2-4a16-823e-2365885e2598', 1, 'timeofuse', '元/千瓦时', '2020-12-31 16:00:00', '2021-06-30 15:59:59'),
 (5, '2021分时电价7-9',    'd1285c81-4612-4d7c-9436-ed11b4e7abe4', 1, 'timeofuse', '元/千瓦时', '2021-06-30 16:00:00', '2021-09-30 15:59:59'),
 (6, '2021分时电价10-12',  'e6c275b4-47eb-4f5d-bc59-edbe45c2a407', 1, 'timeofuse', '元/千瓦时', '2021-09-30 16:00:00', '2021-12-31 15:59:59'),
@@ -768,8 +768,8 @@ VALUES
 (10, '2023分时电价1-6',   '3fa6e1f2-7d08-4f5a-bcbf-beb041d569c0', 1, 'timeofuse', '元/千瓦时', '2022-12-31 16:00:00', '2023-06-30 15:59:59'),
 (11, '2023分时电价7-9',   '787240fb-1694-403e-a0a7-83d7be1cc0b8', 1, 'timeofuse', '元/千瓦时', '2023-06-30 16:00:00', '2023-09-30 15:59:59'),
 (12, '2023分时电价10-12', 'a07fdf76-edcf-4124-96e7-ab733a5a4b70', 1, 'timeofuse', '元/千瓦时', '2023-09-30 16:00:00', '2023-12-31 15:59:59'),
-(13, '自来水',  '6fcbc77e-effb-4d43-9b30-77b062435d34', 2, 'timeofuse', '元/m³',    '2019-12-31 16:00:00', '2023-12-31 15:59:59'),
-(14, '天然气', '6a4c56ff-b3e1-4555-9b1c-87d05bcfa4d9', 3, 'timeofuse', '元/m³',    '2019-12-31 16:00:00', '2023-12-31 15:59:59');
+(13, '自来水',  '6fcbc77e-effb-4d43-9b30-77b062435d34', 2, 'timeofuse', '元/m³',    '2020-12-31 16:00:00', '2024-12-31 15:59:59'),
+(14, '天然气', '6a4c56ff-b3e1-4555-9b1c-87d05bcfa4d9', 3, 'timeofuse', '元/m³',    '2020-12-31 16:00:00', '2024-12-31 15:59:59');
 
 COMMIT;
 

diff --git a/database/demo-de/myems_system_db.sql b/database/demo-de/myems_system_db.sql
@@ -759,9 +759,9 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_tariffs`
 (`id`, `name`, `uuid`, `energy_category_id`, `tariff_type`, `unit_of_price`, `valid_from_datetime_utc`, `valid_through_datetime_utc`)
 VALUES
-(1, '2020TimeOfUseElectricity1-6',    '590efb36-8587-42a9-ae6f-c715d21496d6', 1, 'timeofuse', 'EUR/kWh', '2019-12-31 16:00:00', '2020-06-30 15:59:59'),
-(2, '2020TimeOfUseElectricity7-9',    'f5966640-18fc-437a-9efd-cbc0c58b6373', 1, 'timeofuse', 'EUR/kWh', '2020-06-30 16:00:00', '2020-09-30 15:59:59'),
-(3, '2020TimeOfUseElectricity10-12',  '21727a1b-4b27-4186-b72e-db46e6e2d980', 1, 'timeofuse', 'EUR/kWh', '2020-09-30 16:00:00', '2020-12-31 15:59:59'),
+(1, '2024TimeOfUseElectricity1-6',    '590efb36-8587-42a9-ae6f-c715d21496d6', 1, 'timeofuse', 'EUR/kWh', '2023-12-31 16:00:00', '2024-06-30 15:59:59'),
+(2, '2024TimeOfUseElectricity7-9',    'f5966640-18fc-437a-9efd-cbc0c58b6373', 1, 'timeofuse', 'EUR/kWh', '2024-06-30 16:00:00', '2024-09-30 15:59:59'),
+(3, '2024TimeOfUseElectricity10-12',  '21727a1b-4b27-4186-b72e-db46e6e2d980', 1, 'timeofuse', 'EUR/kWh', '2024-09-30 16:00:00', '2024-12-31 15:59:59'),
 (4, '2021TimeOfUseElectricity1-6',    'fe65e443-0ec2-4a16-823e-2365885e2598', 1, 'timeofuse', 'EUR/kWh', '2020-12-31 16:00:00', '2021-06-30 15:59:59'),
 (5, '2021TimeOfUseElectricity7-9',    'd1285c81-4612-4d7c-9436-ed11b4e7abe4', 1, 'timeofuse', 'EUR/kWh', '2021-06-30 16:00:00', '2021-09-30 15:59:59'),
 (6, '2021TimeOfUseElectricity10-12',  'e6c275b4-47eb-4f5d-bc59-edbe45c2a407', 1, 'timeofuse', 'EUR/kWh', '2021-09-30 16:00:00', '2021-12-31 15:59:59'),
@@ -771,8 +771,8 @@ VALUES
 (10, '2023TimeOfUseElectricity1-6',   '3fa6e1f2-7d08-4f5a-bcbf-beb041d569c0', 1, 'timeofuse', 'EUR/kWh', '2022-12-31 16:00:00', '2023-06-30 15:59:59'),
 (11, '2023TimeOfUseElectricity7-9',   '787240fb-1694-403e-a0a7-83d7be1cc0b8', 1, 'timeofuse', 'EUR/kWh', '2023-06-30 16:00:00', '2023-09-30 15:59:59'),
 (12, '2023TimeOfUseElectricity10-12', 'a07fdf76-edcf-4124-96e7-ab733a5a4b70', 1, 'timeofuse', 'EUR/kWh', '2023-09-30 16:00:00', '2023-12-31 15:59:59'),
-(13, 'Leitungswasser',  '6fcbc77e-effb-4d43-9b30-77b062435d34', 2, 'timeofuse', 'EUR/m³',    '2019-12-31 16:00:00', '2023-12-31 15:59:59'),
-(14, 'Erdgas', '6a4c56ff-b3e1-4555-9b1c-87d05bcfa4d9', 3, 'timeofuse', 'EUR/m³',    '2019-12-31 16:00:00', '2023-12-31 15:59:59');
+(13, 'Leitungswasser',  '6fcbc77e-effb-4d43-9b30-77b062435d34', 2, 'timeofuse', 'EUR/m³',    '2020-12-31 16:00:00', '2024-12-31 15:59:59'),
+(14, 'Erdgas', '6a4c56ff-b3e1-4555-9b1c-87d05bcfa4d9', 3, 'timeofuse', 'EUR/m³',    '2020-12-31 16:00:00', '2024-12-31 15:59:59');
 
 COMMIT;
 

diff --git a/database/demo-en/myems_system_db.sql b/database/demo-en/myems_system_db.sql
@@ -758,9 +758,9 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_tariffs`
 (`id`, `name`, `uuid`, `energy_category_id`, `tariff_type`, `unit_of_price`, `valid_from_datetime_utc`, `valid_through_datetime_utc`)
 VALUES
-(1, '2020TimeOfUse1-6',    '590efb36-8587-42a9-ae6f-c715d21496d6', 1, 'timeofuse', 'USD/kWh', '2019-12-31 16:00:00', '2020-06-30 15:59:59'),
-(2, '2020TimeOfUse7-9',    'f5966640-18fc-437a-9efd-cbc0c58b6373', 1, 'timeofuse', 'USD/kWh', '2020-06-30 16:00:00', '2020-09-30 15:59:59'),
-(3, '2020TimeOfUse10-12',  '21727a1b-4b27-4186-b72e-db46e6e2d980', 1, 'timeofuse', 'USD/kWh', '2020-09-30 16:00:00', '2020-12-31 15:59:59'),
+(1, '2024TimeOfUse1-6',    '590efb36-8587-42a9-ae6f-c715d21496d6', 1, 'timeofuse', 'USD/kWh', '2023-12-31 16:00:00', '2024-06-30 15:59:59'),
+(2, '2024TimeOfUse7-9',    'f5966640-18fc-437a-9efd-cbc0c58b6373', 1, 'timeofuse', 'USD/kWh', '2024-06-30 16:00:00', '2024-09-30 15:59:59'),
+(3, '2024TimeOfUse10-12',  '21727a1b-4b27-4186-b72e-db46e6e2d980', 1, 'timeofuse', 'USD/kWh', '2024-09-30 16:00:00', '2024-12-31 15:59:59'),
 (4, '2021TimeOfUse1-6',    'fe65e443-0ec2-4a16-823e-2365885e2598', 1, 'timeofuse', 'USD/kWh', '2020-12-31 16:00:00', '2021-06-30 15:59:59'),
 (5, '2021TimeOfUse7-9',    'd1285c81-4612-4d7c-9436-ed11b4e7abe4', 1, 'timeofuse', 'USD/kWh', '2021-06-30 16:00:00', '2021-09-30 15:59:59'),
 (6, '2021TimeOfUse10-12',  'e6c275b4-47eb-4f5d-bc59-edbe45c2a407', 1, 'timeofuse', 'USD/kWh', '2021-09-30 16:00:00', '2021-12-31 15:59:59'),
@@ -770,8 +770,8 @@ VALUES
 (10, '2023TimeOfUse1-6',   '3fa6e1f2-7d08-4f5a-bcbf-beb041d569c0', 1, 'timeofuse', 'USD/kWh', '2022-12-31 16:00:00', '2023-06-30 15:59:59'),
 (11, '2023TimeOfUse7-9',   '787240fb-1694-403e-a0a7-83d7be1cc0b8', 1, 'timeofuse', 'USD/kWh', '2023-06-30 16:00:00', '2023-09-30 15:59:59'),
 (12, '2023TimeOfUse10-12', 'a07fdf76-edcf-4124-96e7-ab733a5a4b70', 1, 'timeofuse', 'USD/kWh', '2023-09-30 16:00:00', '2023-12-31 15:59:59'),
-(13, 'Water',  '6fcbc77e-effb-4d43-9b30-77b062435d34', 2, 'timeofuse', 'USD/m³',    '2019-12-31 16:00:00', '2023-12-31 15:59:59'),
-(14, 'Natural Gas', '6a4c56ff-b3e1-4555-9b1c-87d05bcfa4d9', 3, 'timeofuse', 'USD/m³',    '2019-12-31 16:00:00', '2023-12-31 15:59:59');
+(13, 'Water',  '6fcbc77e-effb-4d43-9b30-77b062435d34', 2, 'timeofuse', 'USD/m³',    '2020-12-31 16:00:00', '2024-12-31 15:59:59'),
+(14, 'Natural Gas', '6a4c56ff-b3e1-4555-9b1c-87d05bcfa4d9', 3, 'timeofuse', 'USD/m³',    '2020-12-31 16:00:00', '2024-12-31 15:59:59');
 
 COMMIT;