return csv string

This commit is contained in:
2023-11-21 21:07:47 +00:00
parent 70f928d961
commit c6b56207dd
3 changed files with 24 additions and 20 deletions
+1 -1
View File
@@ -18,7 +18,7 @@
"MONGOHOST": "192.168.178.190",
"MONGOAUTH": "true",
"MONGOUSRP": "admin:mongo4noise",
"DBASE": "influx"
// "DBASE": "influx"
}
},
{
+1 -1
View File
@@ -6,7 +6,7 @@ const router = express.Router();
/* GET home page. */
router.get('/', function(req, res, next) {
res.status(200).json({message: trans('NOTHIMG')})
res.status(200).json({message: trans('NOTHING')})
});
export default router
+22 -18
View File
@@ -36,24 +36,28 @@ export const getNoiseData = async (params, possibles, props) => {
opts.start = start
opts.stop = stop
let erg = await x.func(opts) // get the data
ret = {
err: erg.err,
options: {
sid: opts.sensorid,
indoor: props.location[0].indoor,
span: opts.span,
start: DateTime.fromISO(opts.start.slice(7)).toUTC().toISO(),
data: opts.data,
peak: opts.peak,
count: erg.values.length,
},
values: erg.values,
}
if (!x.peak) {
delete ret.options.peak
}
if(ret.values.length === 0) {
ret.err = trans('NODATA')
if (opts.csv === true) {
ret = erg
} else {
ret = {
err: erg.err,
options: {
sid: opts.sensorid,
indoor: props.location[0].indoor,
span: opts.span,
start: DateTime.fromISO(opts.start.slice(7)).toUTC().toISO(),
data: opts.data,
peak: opts.peak,
count: erg.values.length,
},
values: erg.values,
}
if (!x.peak) {
delete ret.options.peak
}
if(ret.values.length === 0) {
ret.err = trans('NODATA')
}
}
return ret
}