diff --git a/mean-app/server/routes/thingapi.js b/mean-app/server/routes/thingapi.js index a7d72d9..1937d61 100644 --- a/mean-app/server/routes/thingapi.js +++ b/mean-app/server/routes/thingapi.js @@ -32,7 +32,6 @@ var parseTelegram = function(data, callback){ if(found) toe1 = found[1]; -console.log(toe1); //TOE2 regx = /1-0:1\.8\.2\((\d{5,6}\.\d{3})\*kWh\)/g; @@ -103,8 +102,7 @@ console.log(toe1); router.post('/telegram', function(req, res){ - console.log("Telegram received: "); - console.log(req.body); + console.log("Telegram received"); connection.query( 'INSERT INTO telegram (time, data) VALUES (NOW(), ?)', [req.body.datagram], diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js index f28e6ef..7ff1d5f 100644 --- a/mean-app/server/routes/webapi.js +++ b/mean-app/server/routes/webapi.js @@ -157,6 +157,8 @@ router.get('/data/:device/group/:group', function(req, res) { break; } + console.log("Calculating group ", groupdiv); + 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` = ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`', [groupdiv, devid], function (error, results, fields) {