-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Luca Brandimarti
committed
May 25, 2020
1 parent
3ad087b
commit 5344e83
Showing
3 changed files
with
56 additions
and
69 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,14 @@ | ||
const express = require('express'); | ||
const dotenv = require('dotenv'); | ||
const temperature = require('./temperature/temperature.controller'); | ||
const cron = require('node-cron'); | ||
|
||
|
||
dotenv.config(); | ||
const app = express(); | ||
const port = process.env.PORT | ||
|
||
cron.schedule("40 * * * * *", () => { | ||
console.log("Running Job"); | ||
console.log("-------------------"); | ||
const {board} = require('./arduino/register'); | ||
const express = require('express') | ||
const dotenv = require('dotenv') | ||
const temperature = require('./temperature/temperature.controller') | ||
const {start } = require('./arduino/register') | ||
|
||
dotenv.config() | ||
const app = express() | ||
const port = process.env.PORT || 8080 | ||
|
||
app.use('/temperature', temperature) | ||
app.listen(port, () => { | ||
console.log(`server started at http://localhost:${port}`) | ||
start() | ||
}) | ||
|
||
|
||
app.use('/temperature',temperature); | ||
app.listen( port, () => { | ||
console.log( `server started at http://localhost:${ port }`); | ||
}); | ||
|
65 changes: 30 additions & 35 deletions
65
src/temperature/temperature.controller.js
100644 → 100755
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,43 +1,38 @@ | ||
const express = require('express'); | ||
const {database} = require('./temperature.service'); | ||
const express = require('express') | ||
const { database } = require('./temperature.service') | ||
|
||
temperature = express.Router(); | ||
temperature = express.Router() | ||
|
||
temperature.get('/hour-Avg/:day/:month/:year/:hours', ( req, res ) => { | ||
|
||
var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' | ||
temperature.get('/hour-Avg/:day/:month/:year/:hours', (req, res) => { | ||
var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' | ||
and log.month = '${req.params.month}' | ||
and log.year = '${req.params.year}' and log.hours = '${req.params.hours}'; );` | ||
|
||
database.get(query, (err,row) =>{ | ||
if(err) { | ||
res.status(400).json({"error":err.message}); | ||
return; | ||
} | ||
res.json({ | ||
"temperature":row | ||
}); | ||
}); | ||
}); | ||
|
||
temperature.get('/day-Avg/:day/:month/:year', ( req, res ) => { | ||
var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' | ||
database.get(query, (err, row) => { | ||
if (err) { | ||
res.status(400).json({ error: err.message }) | ||
return | ||
} | ||
res.json({ | ||
temperature: row, | ||
}) | ||
}) | ||
}) | ||
|
||
temperature.get('/day-Avg/:day/:month/:year', (req, res) => { | ||
var query = `SELECT avg(celsius) FROM log where log.day = '${req.params.day}' | ||
and log.month = '${req.params.month}' | ||
and log.year = '${req.params.year}'; );` | ||
|
||
database.get(query, (err,row) =>{ | ||
if(err) { | ||
res.status(400).json({"error":err.message}); | ||
return; | ||
} | ||
res.json({ | ||
"temperature":row | ||
}); | ||
}); | ||
}); | ||
|
||
module.exports = temperature; | ||
|
||
|
||
|
||
|
||
database.get(query, (err, row) => { | ||
if (err) { | ||
res.status(400).json({ error: err.message }) | ||
return | ||
} | ||
res.json({ | ||
temperature: row, | ||
}) | ||
}) | ||
}) | ||
|
||
module.exports = temperature |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
const sqlite3 = require('sqlite3').verbose(); | ||
|
||
|
||
let database = new sqlite3.Database('./src/database/temperatureDB.db', sqlite3.OPEN_READWRITE, (err) => { | ||
if (err) { | ||
console.error(err.message); | ||
}else{ | ||
console.log('connessione al database temperatureDB'); | ||
const sqlite3 = require('sqlite3').verbose() | ||
|
||
let database = new sqlite3.Database( | ||
'./src/database/temperatureDB.db', | ||
sqlite3.OPEN_READWRITE, | ||
(err) => { | ||
if (err) { | ||
console.error(err.message) | ||
} else { | ||
console.log('connessione al database temperatureDB') | ||
} | ||
}); | ||
|
||
module.exports = {database}; | ||
|
||
|
||
} | ||
) | ||
|
||
module.exports = { database } |