优化点位查询

industry-system/cqcy-ei-influxdb/src/main/java/com/cqcy/ei/influxdb/config/MyInvocationHandler.java

@@ -64,7 +64,7 @@ public class MyInvocationHandler implements InvocationHandler {
         Map<String, String> map = getFunApi(method, properties);
         // 解析sql
         String sql = getSql(boundSql, map);
-//        StaticLog.info("执行方法=>{}", statementId);
+        StaticLog.info("执行方法=>{}", statementId);
         if(properties.isLookSql()){
             StaticLog.info("执行sql=>\n{}", sql);
         }
@@ -74,7 +74,7 @@ public class MyInvocationHandler implements InvocationHandler {
         if (properties.isLookResult()) {
             StaticLog.info("执行结果=>{}", result);
         }
-//        StaticLog.info("执行耗时=>{}ms", System.currentTimeMillis() - start);
+        StaticLog.info("执行耗时=>{}ms", System.currentTimeMillis() - start);
         return result;
     }
 

industry-system/cqcy-ei-influxdb/src/main/resources/flux/QueryMapper.xml

@@ -4,14 +4,15 @@
 
     <!--查询时间范围内的最新数据-->
     <select id="getItemDataByLast">
-        import "strings"
-        import "regexp"
-
         from(bucket: #{myBucket})
             |> range(start: ${startTime}, stop: ${endTime})
             |> filter(fn: (r) => r["_measurement"] == #{myTable})
             |> filter(fn: (r) => r["name"] == #{table} or r["DataSource"] == #{table})
-            |> filter(fn: (r) => r["_field"] =~ regexp.compile(v: strings.replaceAll(v: <foreach collection="items" item="item" separator="|" open="&quot;" close="&quot;">${item}</foreach>,t:" ",u: "")))
+            |> filter(fn: (r) => r["_field"] =~
+                <trim suffixOverrides=" " prefixOverrides=" ">
+                    <foreach collection="items" item="item" separator="|" open="/" close="/">${item}</foreach>
+                </trim>
+            )
             |> map(fn: (r) => ({
                 _field: r["_field"],
                 _value: r["_value"],
@@ -22,9 +23,6 @@
 
     <!--查询时间范围内的历史数据-->
     <select id="getItemDataHistory">
-        import "strings"
-        import "regexp"
-
         <foreach collection="list" item="item">
             ${item.bucket} = from(bucket: #{item.bucket})
                 |> range(start: ${startTime}, stop: ${endTime})
@@ -34,7 +32,11 @@
                         r["_measurement"] == #{measure}
                     </foreach>
                 )
-                |> filter(fn: (r) => r["_field"] =~ regexp.compile(v: strings.replaceAll(v: <foreach collection="items" item="field" separator="|" open="&quot;" close="&quot;">${field}</foreach>,t:" ",u: "")))
+                |> filter(fn: (r) => r["_field"] =~
+                    <trim suffixOverrides=" " prefixOverrides=" ">
+                        <foreach collection="items" item="field" separator="|" open="/" close="/">${field}</foreach>
+                    </trim>
+                )
                 |> map(fn: (r) => ({
                     _field: r["_field"],
                     _value: r["_value"],
@@ -59,7 +61,11 @@
             |> range(start: ${startTime}, stop: ${endTime})
             |> filter(fn: (r) => r["name"] == #{table} or r["DataSource"] == #{table})
             |> filter(fn: (r) => r["_measurement"] == #{measurement} )
-            |> filter(fn: (r) => r["_field"] =~ regexp.compile(v: strings.replaceAll(v: <foreach collection="items" item="field" separator="|" open="&quot;" close="&quot;">${field}</foreach>,t:" ",u: "")))
+            |> filter(fn: (r) => r["_field"] =~
+                <trim suffixOverrides=" " prefixOverrides=" ">
+                    <foreach collection="items" item="field" separator="|" open="/" close="/">${field}</foreach>
+                </trim>
+            )
             |> map(fn: (r) => ({
                 _field: r["_field"],
                 _value: r["_value"],

industry-system/cqcy-ei-influxdb/src/main/resources/influxdb-client.yml

@@ -16,4 +16,4 @@ spring:
     mapper: flux
     # 是否查看执行结果
     look-result: false
-    look-sql: true
+    look-sql: false