mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-07-10 07:07:21 +00:00
Merge pull request #433 from SyncrowIOT/DATA-adjust-remaining-procedures
DATA-adjust-remaining-procedures
This commit is contained in:
@ -1,7 +1,6 @@
|
||||
WITH params AS (
|
||||
SELECT
|
||||
TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
|
||||
$2::uuid AS space_id
|
||||
TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
|
||||
),
|
||||
|
||||
-- Query Pipeline Starts Here
|
||||
@ -277,7 +276,10 @@ SELECT
|
||||
a.daily_avg_ch2o,a.daily_max_ch2o, a.daily_min_ch2o
|
||||
FROM daily_percentages p
|
||||
LEFT JOIN daily_averages a
|
||||
ON p.space_id = a.space_id AND p.event_date = a.event_date
|
||||
ON p.space_id = a.space_id
|
||||
AND p.event_date = a.event_date
|
||||
JOIN params
|
||||
ON params.event_date = a.event_date
|
||||
ORDER BY p.space_id, p.event_date)
|
||||
|
||||
|
||||
|
@ -1,7 +1,6 @@
|
||||
WITH params AS (
|
||||
SELECT
|
||||
TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
|
||||
$2::uuid AS space_id
|
||||
TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
|
||||
),
|
||||
|
||||
presence_logs AS (
|
||||
@ -86,8 +85,7 @@ final_data AS (
|
||||
ROUND(LEAST(raw_occupied_seconds, 86400) / 86400.0 * 100, 2) AS occupancy_percentage
|
||||
FROM summed_intervals s
|
||||
JOIN params p
|
||||
ON p.space_id = s.space_id
|
||||
AND p.event_date = s.event_date
|
||||
ON p.event_date = s.event_date
|
||||
)
|
||||
|
||||
INSERT INTO public."space-daily-occupancy-duration" (
|
||||
|
@ -1,7 +1,6 @@
|
||||
WITH params AS (
|
||||
SELECT
|
||||
TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date,
|
||||
$2::uuid AS space_id
|
||||
TO_DATE(NULLIF($1, ''), 'YYYY-MM-DD') AS event_date
|
||||
),
|
||||
|
||||
device_logs AS (
|
||||
@ -87,8 +86,7 @@ SELECT summary.space_id,
|
||||
count_total_presence_detected
|
||||
FROM summary
|
||||
JOIN params P ON true
|
||||
where summary.space_id = P.space_id
|
||||
and (P.event_date IS NULL or summary.event_date::date = P.event_date)
|
||||
where (P.event_date IS NULL or summary.event_date::date = P.event_date)
|
||||
ORDER BY space_id, event_date)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user