合并代码

pqs-common/common-influxdb/src/main/java/com/njcn/influxdb/utils/AssembleSqlUtil.java

@@ -6,6 +6,7 @@ import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.njcn.influxdb.param.InfluxDBSqlConstant;
+import com.njcn.influxdb.param.InfluxDBTableConstant;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -143,7 +144,16 @@ public class AssembleSqlUtil {
         List<String> ia = new ArrayList<>();
         ia.add("1");
         ia.add("2");
-        System.out.println(assembleSqlUtil.select("data_a").where(map,orField,ia).groupBy(orField,null).orderBy("time","desc").over());
-        System.out.println(assembleSqlUtil.selectField(Stream.of("a", "d", "c", "b").collect(Collectors.toList()), "test").over());
+        System.out.println(assembleSqlUtil.
+                select(InfluxDBTableConstant.DAY_V)
+                .where(map,orField,ia)
+                .groupBy(orField,null)
+                .orderBy(InfluxDBTableConstant.TIME,InfluxDBSqlConstant.DESC)
+                .over()
+        );
+        System.out.println(assembleSqlUtil.
+                selectField(Stream.of(InfluxDBTableConstant.DUE, InfluxDBTableConstant.REAL)
+                        .collect(Collectors.toList()), InfluxDBTableConstant.DAY_V)
+                .over());
     }
 }