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

Merge branch 'develop'

pull/121/MERGE
13621160019@163.com 2022-01-29 18:10:35 +08:00
parent d9c88d95d2 f977d2c1c4
commit 39f419fccc
3 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -22,7 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant - added alternative uuid parameter to reports of combined equipment, equipment, meter, shopfloor, store and tenant
- added meter carbon dioxide emission report to api - added meter carbon dioxide emission report to api
- added meter carbon dioxide emission aggregation procedure - added meter carbon dioxide emission aggregation procedure
- added virtual meter carbon dioxide emssion aggregation procedure - added virtual meter carbon dioxide emission aggregation procedure
- added offline meter carbon dioxide emission aggregation procedure - added offline meter carbon dioxide emission aggregation procedure
### Changed ### Changed
@ -33,8 +33,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- fixed select statements issue in tenant reports. - fixed select statements issue in tenant reports.
- fixed fraction numerator and denominator issue in combinedequipmentefficiency and equipmentefficiency reports - fixed fraction numerator and denominator issue in combinedequipmentefficiency and equipmentefficiency reports
- fixed issue of config in aggregation service - fixed issue of config in aggregation service
- fixed issue of carbon_dioxide_emmision_factor in aggregation serivce - fixed issue of carbon_dioxide_emission_factor in aggregation service
- fixed isssues in README - fixed issues in README
### Removed ### Removed
- None. - None.

55
database/recalculating/recalculating-delete-batch.sql
View File

@ -111,3 +111,58 @@ WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_billing_db`.`tbl_virtual_meter_hourly` DELETE FROM `myems_billing_db`.`tbl_virtual_meter_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00'; WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_combined_equipment_input_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_combined_equipment_input_item_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_combined_equipment_output_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_equipment_input_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_equipment_input_item_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_equipment_output_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_meter_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_offline_meter_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_shopfloor_input_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_shopfloor_input_item_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_space_input_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_space_input_item_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_space_output_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_store_input_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_store_input_item_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_tenant_input_category_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_tenant_input_item_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';
DELETE FROM `myems_carbon_db`.`tbl_virtual_meter_hourly`
WHERE start_datetime_utc >= '2020-12-31 16:00:00';

19
database/recalculating/recalculating-truncate.sql
View File

@ -41,3 +41,22 @@ TRUNCATE TABLE myems_billing_db.tbl_store_input_item_hourly;
TRUNCATE TABLE myems_billing_db.tbl_tenant_input_category_hourly; TRUNCATE TABLE myems_billing_db.tbl_tenant_input_category_hourly;
TRUNCATE TABLE myems_billing_db.tbl_tenant_input_item_hourly; TRUNCATE TABLE myems_billing_db.tbl_tenant_input_item_hourly;
TRUNCATE TABLE myems_billing_db.tbl_virtual_meter_hourly; TRUNCATE TABLE myems_billing_db.tbl_virtual_meter_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_combined_equipment_input_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_combined_equipment_input_item_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_combined_equipment_output_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_equipment_input_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_equipment_input_item_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_equipment_output_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_meter_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_meter_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_shopfloor_input_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_shopfloor_input_item_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_space_input_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_space_input_item_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_space_output_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_store_input_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_store_input_item_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_tenant_input_category_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_tenant_input_item_hourly;
TRUNCATE TABLE myems_carbon_db.tbl_virtual_meter_hourly;