From e538f2b8290a1ead0cc883916f04391fef957fe9 Mon Sep 17 00:00:00 2001 From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com> Date: Tue, 6 May 2025 11:28:43 +0300 Subject: [PATCH 1/2] grain change --- ..._daily_space_energy_consumed_procedure.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql diff --git a/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql b/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql new file mode 100644 index 0000000..1a127fa --- /dev/null +++ b/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql @@ -0,0 +1,20 @@ +WITH params AS ( + SELECT + TO_DATE(NULLIF($1, ''), 'MM-YYYY') AS start_month, + string_to_array(NULLIF($2, ''), ',') AS device_ids +) + +SELECT + A.date, + SUM(A.energy_consumed_kW::numeric) AS total_energy_consumed_KW, + SUM(A.energy_consumed_A::numeric) AS total_energy_consumed_A, + SUM(A.energy_consumed_B::numeric) AS total_energy_consumed_B, + SUM(A.energy_consumed_C::numeric) AS total_energy_consumed_C +FROM public."power-clamp-energy-consumed-daily" AS A +JOIN public.device AS B + ON A.device_uuid::TEXT = B."uuid"::TEXT +JOIN params P ON TRUE +WHERE B."uuid"::TEXT = ANY(P.device_ids) + AND (P.start_month IS NULL OR date_trunc('month', A.date)= P.start_month) +GROUP BY A.date +ORDER BY A.date; From 0d48505eacdaa624bd8086768ea9e3fae32c6d15 Mon Sep 17 00:00:00 2001 From: Dona Maria Absi <49731027+DonaAbsi@users.noreply.github.com> Date: Tue, 6 May 2025 11:30:23 +0300 Subject: [PATCH 2/2] month name --- .../fact_daily_space_energy_consumed_procedure.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql b/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql index 1a127fa..7cd49a5 100644 --- a/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql +++ b/libs/common/src/sql/procedures/fact_space_energy_consumed/fact_daily_space_energy_consumed_procedure.sql @@ -1,6 +1,6 @@ WITH params AS ( SELECT - TO_DATE(NULLIF($1, ''), 'MM-YYYY') AS start_month, + TO_DATE(NULLIF($1, ''), 'MM-YYYY') AS month, string_to_array(NULLIF($2, ''), ',') AS device_ids ) @@ -15,6 +15,6 @@ JOIN public.device AS B ON A.device_uuid::TEXT = B."uuid"::TEXT JOIN params P ON TRUE WHERE B."uuid"::TEXT = ANY(P.device_ids) - AND (P.start_month IS NULL OR date_trunc('month', A.date)= P.start_month) + AND (P.month IS NULL OR date_trunc('month', A.date)= P.month) GROUP BY A.date ORDER BY A.date;