wmantly/mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update API routes and sensor data functionality And API.ejs

Browse Source
This commit is contained in:
newtbot
2024-01-30 02:59:14 +08:00
parent 8836a3cfd4
commit 129ca202c0
10 changed files with 849 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
consumerWebsite/functions/api.js
View File

@ -8,6 +8,7 @@ async function getTokenByToken(token) {
const splitAuthToken = token.split("-");
const rowid = splitAuthToken[0];
const suppliedToken = splitAuthToken.slice(1).join("-");
if (!suppliedToken) return false;
token = await tokenModel.findByPk(rowid, { include: userModel });

15
consumerWebsite/functions/sensorData.js
View File

@ -18,17 +18,17 @@ async function getSensorData() {
const sensorData = await sensorDataModel.findAll();
return sensorData;
}
async function addSensorData(id_sensor, id_location, sensordata) {
async function addSensorData(sensorid , locationid , measurement) {
const sensorData = await sensorDataModel.create({
sensorid: id_sensor,
locationid: id_location ,
measurement: sensordata.measurement,
sensorid: sensorid,
locationid: locationid,
measurement: measurement
});
//console.log("sensorData", sensorData);
//console.log("sensorData", sensordata.measurement);
//console.log("sensorData", sensorData.measurement);
io().emit('sensorData:new', sensordata)
io().emit('sensorData:new', sensorData.measurement);
return sensorData;
}
@ -674,6 +674,7 @@ async function getDatabyRange(queryString) {
queryString.limit = queryString.pagesize;
whereDate = {};
ormQuery = {};
for (let query in queryString) {
if (buildFunc[query]) {
await buildFunc[query](queryString);
@ -700,6 +701,8 @@ async function getDatabyRange(queryString) {
}
} else {
whereDate = {};
ormQuery = {};
for (let query in queryString) {
if (buildFunc[query]) {
await buildFunc[query](queryString);