diff --git a/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_daily_device_energy_consumed.sql b/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_daily_device_energy_consumed.sql index 28fcc93..d3c3ba1 100644 --- a/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_daily_device_energy_consumed.sql +++ b/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_daily_device_energy_consumed.sql @@ -5,8 +5,8 @@ WITH total_energy AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumed' GROUP BY 1,2,3,4,5 @@ -19,8 +19,8 @@ energy_phase_A AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumedA' GROUP BY 1,2,3,4,5 @@ -33,8 +33,8 @@ energy_phase_B AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumedB' GROUP BY 1,2,3,4,5 @@ -47,8 +47,8 @@ energy_phase_C AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumedC' GROUP BY 1,2,3,4,5 diff --git a/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_hourly_device_energy_consumed.sql b/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_hourly_device_energy_consumed.sql index a0358c1..173dd03 100644 --- a/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_hourly_device_energy_consumed.sql +++ b/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_hourly_device_energy_consumed.sql @@ -26,6 +26,7 @@ energy_phase_A AS ( GROUP BY 1,2,3,4,5 ), + energy_phase_B AS ( SELECT log.device_id, diff --git a/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_monthly_device_energy_consumed.sql b/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_monthly_device_energy_consumed.sql index 454f532..a0ffc7c 100644 --- a/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_monthly_device_energy_consumed.sql +++ b/libs/common/src/sql/procedures/fact_device_energy_consumed/procedure_insert_all_fact_monthly_device_energy_consumed.sql @@ -5,8 +5,8 @@ WITH total_energy AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumed' GROUP BY 1,2,3,4,5 @@ -19,8 +19,8 @@ energy_phase_A AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumedA' GROUP BY 1,2,3,4,5 @@ -33,8 +33,8 @@ energy_phase_B AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumedB' GROUP BY 1,2,3,4,5 @@ -47,8 +47,8 @@ energy_phase_C AS ( EXTRACT(HOUR FROM log.event_time) AS hour, TO_CHAR(log.event_time, 'MM-YYYY') AS event_month, EXTRACT(YEAR FROM log.event_time)::int AS event_year, - MIN(log.value)::integer AS min_value, - MAX(log.value)::integer AS max_value + MIN(log.value)::integer/100 AS min_value, + MAX(log.value)::integer/100 AS max_value FROM "device-status-log" log WHERE log.code = 'EnergyConsumedC' GROUP BY 1,2,3,4,5