Fix #15 aggregate option is not working

mcci-catena · Sep 1, 2023 · 741308b · 741308b
1 parent fe6fd3f
commit 741308b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/controllers/influx.controller.js b/app/controllers/influx.controller.js
@@ -242,7 +242,7 @@ exports.readInflux = (indata) => {
 
         const count = indata.id;
 
-        var aggfn = "\""+ indata.sdata+"\""
+        var pname = "\""+ indata.sdata+"\""  // parameter
 
         let devid = "("
         orflg = 0
@@ -276,7 +276,7 @@ exports.readInflux = (indata) => {
         var todtstr = indata.todate.toISOString();
 
         query = ""+indata.server+"/query?db="+indata.db+
-                "&q=select+mean("+aggfn+")+"+indata.math+"+from+"+
+                "&q=select+"+indata.aggfn+"("+pname+")+"+indata.math+"+from+"+
                 "\""+indata.measure+"\""+"+where+"+devid+"+and+time+>=+'"+fmdtstr+
                 "'+and+time+<=+'"+todtstr+"'+group+by+time("+indata.gbt+"m)"
 

diff --git a/app/controllers/sread.controller.js b/app/controllers/sread.controller.js
@@ -131,6 +131,7 @@ async function fetchFromInflux(req, res, fmdate, todate)
 
     influxset.sdata = req.query.sdata
     influxset.device = req.query.device
+    influxset.aggfn = req.query.aggfn
     influxset.gbt = req.query.gbt
 
 

diff --git a/app/misc/constants.js b/app/misc/constants.js
@@ -24,7 +24,7 @@
 
 module.exports = Object.freeze({
     APP_NAME: 'Excel Plugin API',
-    APP_VERSION: '1.1.2',
+    APP_VERSION: '1.1.3',
     APP_PORT: 8892,
 
     KEY_SECRET: 'mcciradweindiauspvp',