diff --git a/fact_daily_space_temperature_balancing/fact_daily_space_temperature_balancing.sql b/fact_hourly_space_temperature_balancing/fact_hourly_space_temperature_balancing.sql similarity index 100% rename from fact_daily_space_temperature_balancing/fact_daily_space_temperature_balancing.sql rename to fact_hourly_space_temperature_balancing/fact_hourly_space_temperature_balancing.sql diff --git a/fact_power_clamp_daily_energy_consumed/fact_power_clamp_daily_energy_clamp.sql b/fact_power_clamp_daily_energy_consumed/fact_power_clamp_daily_energy_clamp.sql index 7499892..4b9eb2d 100644 --- a/fact_power_clamp_daily_energy_consumed/fact_power_clamp_daily_energy_clamp.sql +++ b/fact_power_clamp_daily_energy_consumed/fact_power_clamp_daily_energy_clamp.sql @@ -1,9 +1,13 @@ -SELECT distinct(code) +SELECT event_time::date, +device_id , +space_device_uuid as space_id, +sum(value::integer) as total_energy_consummed FROM device LEFT JOIN "device-status-log" ON device.uuid = "device-status-log".device_id LEFT JOIN product ON product.uuid = device.product_device_uuid where product.name='Power Clamp' ---and code='VoltageA' ---ORDER BY device.uuid, "device-status-log".event_time \ No newline at end of file +and code in ('EnergyConsumed','EnergyConsumedA','EnergyConsumedB','EnergyConsumedC') +group by 1,2,3 +ORDER BY 1,2