Start using mongo timeseries

mooving all database relevant function to influx.js resp. mongo.js

aktual data now also readable from mongo
This commit is contained in:
rxf
2023-05-25 13:19:03 +02:00
parent 5d10f681ea
commit ca4b68d7ff
5 changed files with 164 additions and 93 deletions
+4 -34
View File
@@ -136,25 +136,9 @@ export async function getSensorData(params) {
// export const getActData = async (opts) => {
export async function getActData(opts) {
let ret = {err: null, values: []}
let sorting = ''
if(opts.sort) {
if (opts.sort === 1) {
sorting = '|> sort(columns: ["_time"], desc: false)'
} else if (opts.sort === -1) {
sorting = '|> sort(columns: ["_time"], desc: true)'
}
}
// build the flux query
let query = `
from(bucket: "sensor_data")
|> range(${opts.start}, ${opts.stop})
|> filter(fn: (r) => r.sid == "${opts.sensorid}")
${sorting}
|> keep(columns: ["_time","_field","_value"])
|> pivot(rowKey:["_time"], columnKey: ["_field"], valueColumn: "_value")
`
return await fetchFromInflux(ret, query)
let retI = await influx.fetchActData(opts)
let retM = await mongo.fetchActData(opts)
return retI
}
@@ -234,21 +218,7 @@ export var getLongAvg = async (params) => {
}
export const fetchFromInflux = async (ret, query) => {
let { values, err} = await influx.influxRead(query)
if(err) {
if(err.toString().includes('400')) {
return returnOnError(ret, 'SYNTAXURL', fetchFromInflux.name)
} else {
return returnOnError(ret, err, fetchFromInflux.name)
}
}
if (values.length <= 2) {
return returnOnError(ret, 'NODATA', fetchFromInflux.name)
}
ret.values = csv2Json(values)
return ret
}
// *********************************************
// function getMAPaktData() {