Avans/smarthome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix queries

Browse Source
This commit is contained in:
kennyboy55
2017-04-11 22:45:10 +02:00
parent 1da3065583
commit 7dd1ea43a6
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mean-app/server/routes/thingapi.js
+3 -3
View File
@@ -86,13 +86,13 @@ var parseTelegram = function(data, callback){
connection.query(
'INSERT INTO measurement (device, TOE1, TOE2, TTE1, TTE2, HT, HOV, HTV, time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())', [device, toe1, toe2, tte1, tte2, ht, hov, htv],
'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;
connection.query(
'INSERT INTO device (SN, name, API) VALUES (?, "New device", 42)', [device],
'INSERT INTO `device` (`SN`, `name`, `API`) VALUES (?, "New device", 42)', [device],
function (error, results, fields) {
callback();
@@ -108,7 +108,7 @@ var parseTelegram = function(data, callback){
router.post('/telegram', function(req, res){
connection.query(
'INSERT INTO telegram (time, data) VALUES (NOW(), ?)', [req.body.datagram],
'INSERT INTO `telegram` (`time`, `data`) VALUES (NOW(), ?)', [req.body.datagram],
function (error, results, fields) {
if (error) throw error;
mean-app/server/routes/webapi.js
+5 -5
View File
@@ -12,7 +12,7 @@ router.all('*', function(req, res){
router.get('/device', function(req, res){
connection.query(
'SELECT SN, name, desc FROM device',
'SELECT `SN`, `name`, `desc` FROM `device`;',
function (error, results, fields) {
if (error) throw error;
@@ -109,7 +109,7 @@ router.get('/data/:device/:year1-:month1-:day1/:year2-:month2-:day2', function(r
let date2 = year2 + "-" + month2 + "-" + day2 + " 23:59:59";
connection.query(
'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? AND time >= ? AND time <= ? ORDER BY time DESC LIMIT 0,250 ) s ORDER BY s.time ASC', [devid, date1, date2],
'SELECT s.* FROM ( SELECT `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HOV`, `HTV`, `HT`, `time` FROM `measurement` WHERE `device` = ? AND `time` >= ? AND `time` <= ? ORDER BY `time` DESC LIMIT 0,250 ) s ORDER BY s.time ASC;', [devid, date1, date2],
function (error, results, fields) {
if (error) throw error;
@@ -183,7 +183,7 @@ router.get('/data/:device', function(req, res) {
let devid = req.params.device;
connection.query(
'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,250 ) s ORDER BY s.time ASC', [devid],
'SELECT s.* FROM ( SELECT `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HOV`, `HTV`, `HT`, `time` FROM `measurement` WHERE `device` = ? ORDER BY `time` DESC LIMIT 0,250 ) s ORDER BY s.time ASC;', [devid],
function (error, results, fields) {
if (error) throw error;
@@ -203,7 +203,7 @@ router.get('/usage/:device', function(req, res) {
let devid = req.params.device;
connection.query(
'SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, tarief1, tarief2 FROM measurement, device WHERE measurement.device = device.SN AND measurement.device = ? ORDER BY time DESC LIMIT 0,1', [devid],
'SELECT `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HOV`, `HTV`, `HT`, `tarief1`, `tarief2` FROM `measurement`, `device` WHERE measurement.`device` = device.`SN` AND measurement.`device` = ? ORDER BY `time` DESC LIMIT 0,1;', [devid],
function (error, results, fields) {
if (error) throw error;
@@ -223,7 +223,7 @@ router.get('/name/:device', function(req, res) {
let devid = req.params.device;
connection.query(
'SELECT name FROM device WHERE SN = ?', [devid],
'SELECT `name` FROM `device` WHERE `SN` = ?', [devid],
function (error, results, fields) {
if (error) throw error;