diff --git a/mean-app/server/routes/thingapi.js b/mean-app/server/routes/thingapi.js index e58ec2b..be6dd8d 100644 --- a/mean-app/server/routes/thingapi.js +++ b/mean-app/server/routes/thingapi.js @@ -82,15 +82,24 @@ console.log(toe1); htv = found[1]; - connection.query( 'INSERT INTO measurement (device, TOE1, TOE2, TTE1, TTE2, HT, HOV, HTV, time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())', [device, toe1, toe2, tte1, tte2, ht, hov, htv], function (error, results, fields) { if (error) throw error; - callback(); + + connection.query( + 'INSERT INTO device (SN, name, API) VALUES (?, "New device", 42)', [device], + function (error, results, fields) { + if (error) throw error; + + callback(); + }); }); + + + } diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js index 3d887ef..f87c782 100644 --- a/mean-app/server/routes/webapi.js +++ b/mean-app/server/routes/webapi.js @@ -9,26 +9,11 @@ router.all('*', function(req, res){ req.next(); }); -router.post('/device', function(req, res){ - console.log("Device received: "); - console.log(req.body); - - connection.query( - 'INSERT INTO device (SN, API) VALUES (?, 42)', [req.body.device], - function (error, results, fields) { - if (error) throw error; - - }); - - res.status(200); - res.send("{\"success\":\"true\"}"); -}); - router.get('/device', function(req, res){ connection.query( - 'SELECT * FROM device', + 'SELECT SN, name FROM device', function (error, results, fields) { if (error) throw error; @@ -42,6 +27,25 @@ router.get('/device', function(req, res){ }); +router.get('/data/:device', function(req, res) { + + let devid = req.params.device; + + connection.query( + 'SELECT TOE1, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,10', [devid], + function (error, results, fields) { + if (error) throw error; + + if (results.length > 0) { + + res.status(200); + res.send(JSON.stringify(results)); + } + + }); + +}); + router.get('/data', function(req, res) { connection.query(