From ea7eecf3c65e6ef0ed78c32dca782a051d990c74 Mon Sep 17 00:00:00 2001 From: kennyboy55 Date: Tue, 11 Apr 2017 11:43:15 +0200 Subject: [PATCH] Still trying to fix SQL syntax --- mean-app/server/routes/webapi.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js index 406a14b..2570975 100644 --- a/mean-app/server/routes/webapi.js +++ b/mean-app/server/routes/webapi.js @@ -77,7 +77,7 @@ router.get('/data/:device/group/:group/:year1-:month1-:day1/:year2-:month2-:day2 connection.query( - 'SELECT MIN(grp.`time`), AVG(grp.`HOV`) as HOV, AVG(grp.`HTV`) as HTV FROM (SELECT @i:=@i+1 AS `rownum`, FLOOR(@i/?) AS `datagrp`, `time`, `HOV`, `HTV` FROM `measurement` WHERE `device` = ? AND `time` >= ? AND `time` <= ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`', [groupdiv, devid, date1, date2], + 'SELECT MIN(grp.`time`) as time, AVG(grp.`HOV`) as HOV, AVG(grp.`HTV`) as HTV FROM (SELECT @i:=@i+1 AS `rownum`, FLOOR(@i/?) AS `datagrp`, `time`, `HOV`, `HTV` FROM `measurement` WHERE `device` = ? AND `time` >= ? AND `time` <= ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`', [groupdiv, devid, date1, date2], function (error, results, fields) { if (error) throw error; @@ -157,10 +157,8 @@ router.get('/data/:device/group/:group', function(req, res) { break; } - console.log("Calculating group ", groupdiv); - connection.query( - 'SET @i:= 0; SELECT MIN(grp.`time`) AS time, AVG(grp.`HOV`) AS HOV, AVG(grp.`HTV`) AS HTV FROM (SELECT @i:=@i+1 AS `rownum`, FLOOR(@i/?) AS `datagrp`, `time`, `HOV`, `HTV` FROM `measurement` WHERE `device` = ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`', [groupdiv, devid], + 'SET @i:= 0; SELECT MIN(grp.`time`) AS t, AVG(grp.`HOV`) AS HOV, AVG(grp.`HTV`) AS HTV FROM (SELECT @i:=@i+1 AS `rownum`, FLOOR(@i/?) AS `datagrp`, `time`, `HOV`, `HTV` FROM `measurement` WHERE `device` = ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`', [groupdiv, devid], function (error, results, fields) { if (error) throw error;