|
|
@@ -141,13 +141,18 @@ public enum InfluxClient { |
|
|
|
|
|
|
|
public List<FluxTable> query(QueryDataParam param){ |
|
|
|
String measurement = param.getMeasurement(); |
|
|
|
List<String> dropedTagNames = param.getDropedTagNames(); |
|
|
|
Range range = param.getRange(); |
|
|
|
|
|
|
|
|
|
|
|
String bucket = param.getBucket(); |
|
|
|
PageInfo pageInfo = param.getPageInfo(); |
|
|
|
|
|
|
|
|
|
|
|
String flux = "from(bucket:\""+bucket+"\")"; |
|
|
|
flux += "|> range(start: "+range.getBegin()+",stop:"+range.getEnd()+")"; |
|
|
|
|
|
|
|
if(param.getRange() != null){ |
|
|
|
Range range = param.getRange(); |
|
|
|
flux += "|> range(start: "+range.getBegin()+",stop:"+range.getEnd()+")"; |
|
|
|
} |
|
|
|
|
|
|
|
flux += "|> filter(fn: (r) => r[\"_measurement\"] == \""+measurement+"\")"; |
|
|
|
|
|
|
|
if(param.getTags()!=null && param.getTags().size()>0){ |
|
|
@@ -161,12 +166,16 @@ public enum InfluxClient { |
|
|
|
//调整时区,查询出的结果 +8个小时 |
|
|
|
//flux += "|> timeShift(duration: 8h)"; |
|
|
|
|
|
|
|
|
|
|
|
for(String dropName:dropedTagNames){ |
|
|
|
flux += "|> drop(columns: [\""+dropName+"\"])"; |
|
|
|
if(param.getDropedTagNames() != null){ |
|
|
|
List<String> dropedTagNames = param.getDropedTagNames(); |
|
|
|
for(String dropName:dropedTagNames){ |
|
|
|
flux += "|> drop(columns: [\""+dropName+"\"])"; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
flux += "|> sort(columns: [\"_time\"], desc: true)"; |
|
|
|
if(pageInfo!=null){ |
|
|
|
if(param.getPageInfo() != null){ |
|
|
|
PageInfo pageInfo = param.getPageInfo(); |
|
|
|
flux += "|> limit(n: "+pageInfo.getSize()+", offset: "+(pageInfo.getCurrent()-1)* pageInfo.getSize()+")"; |
|
|
|
} |
|
|
|
return queryApi.query(flux); |
|
|
|