KRBL/ArgusSite
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

time fix in SQL requests

Browse Source
This commit is contained in:
Ivan 2023-10-07 15:50:46 +03:00
parent bb257a1726
commit b25c17b7bd
Signed by untrusted user who does not match committer: ppechenkoo
GPG Key ID: 0C191B86D9582583
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server.js
View File

@ -568,13 +568,13 @@ async function live(req, res) {
LEFT JOIN registrars AS r ON a.serial = r.serial LEFT JOIN registrars AS r ON a.serial = r.serial
LEFT JOIN ( LEFT JOIN (
SELECT *, SELECT *,
ROW_NUMBER() OVER (PARTITION BY serial ORDER BY ABS(EXTRACT(EPOCH FROM (time - $1)))) AS row_num ROW_NUMBER() OVER (PARTITION BY serial ORDER BY ABS(EXTRACT(EPOCH FROM (time - NOW())))) AS row_num
FROM geo FROM geo
) AS g ON a.serial = g.serial AND g.row_num = 1 ) AS g ON a.serial = g.serial AND g.row_num = 1
ORDER BY a.time DESC ORDER BY a.time DESC
LIMIT 100; LIMIT 100;
`; `;
const alarms = await client.query(subquery, templateData.isAdmin ? [new Date()] : [new Date(), serialValues]); const alarms = await client.query(subquery);
function formatDate(date) { function formatDate(date) {
const options = { const options = {
@ -917,13 +917,13 @@ async function reports(req, res) {
LEFT JOIN registrars AS r ON a.serial = r.serial LEFT JOIN registrars AS r ON a.serial = r.serial
LEFT JOIN ( LEFT JOIN (
SELECT *, SELECT *,
ROW_NUMBER() OVER (PARTITION BY serial ORDER BY ABS(EXTRACT(EPOCH FROM (time - $1)))) AS row_num ROW_NUMBER() OVER (PARTITION BY serial ORDER BY ABS(EXTRACT(EPOCH FROM (time - NOW())))) AS row_num
FROM geo FROM geo
) AS g ON a.serial = g.serial AND g.row_num = 1 ) AS g ON a.serial = g.serial AND g.row_num = 1
ORDER BY a.time DESC ORDER BY a.time DESC
LIMIT 100; LIMIT 100;
`; `;
const alarms = await client.query(query, templateData.isAdmin ? [new Date()] : [new Date(), serialValues]); const alarms = await client.query(query);
function formatDate(date) { function formatDate(date) {
const options = { const options = {