diff --git a/src/main/java/com/njcn/influx/base/InfluxDbBaseMapper.java b/src/main/java/com/njcn/influx/base/InfluxDbBaseMapper.java index 0f105c8..1e572bc 100644 --- a/src/main/java/com/njcn/influx/base/InfluxDbBaseMapper.java +++ b/src/main/java/com/njcn/influx/base/InfluxDbBaseMapper.java @@ -2,6 +2,7 @@ package com.njcn.influx.base; import com.njcn.influx.ano.Insert; +import com.njcn.influx.query.InfluxQueryWrapper; import java.util.List; @@ -23,4 +24,12 @@ public interface InfluxDbBaseMapper { */ @Insert void insertBatch(List entityList); + + /*** + * 根据查询条件返回 + * @author hongawen + * @param influxQueryWrapper 查询条件 + * @return T + */ + List selectByQueryWrapper(InfluxQueryWrapper influxQueryWrapper); } diff --git a/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java b/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java index 8eddf95..16d2d5d 100644 --- a/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java +++ b/src/main/java/com/njcn/influx/query/InfluxQueryWrapper.java @@ -81,7 +81,7 @@ public class InfluxQueryWrapper { /*** * 初始化查询语句 */ - private void initSql() { + public void initSql() { this.selectColumns.clear(); this.conditions.clear(); this.groupColumn.clear(); @@ -95,7 +95,8 @@ public class InfluxQueryWrapper { * @param fieldsStr 属性值 * 输出为 select ["influxColumn" as fieldStr]的形式 */ - public InfluxQueryWrapper select(ICFunction... fieldsStr) { + @SafeVarargs + public final InfluxQueryWrapper select(ICFunction... fieldsStr) { if (ArrayUtil.isNotEmpty(fieldsStr)) { StringBuilder selectFragment = new StringBuilder(); Arrays.stream(fieldsStr).forEach(fieldStr -> { @@ -339,7 +340,9 @@ public class InfluxQueryWrapper { StrPool.COMMA + num + InfluxDbSqlConstant.RBK + - InfluxDbSqlConstant.AS_VALUE; + InfluxDbSqlConstant.AS + + this.getColumnName(resultEntity, LambdaUtil.columnToString(columnName)) + + StrPool.C_SPACE; selectColumns.add(selectFragment); return this; } @@ -360,7 +363,9 @@ public class InfluxQueryWrapper { StrPool.COMMA + num + InfluxDbSqlConstant.RBK + - InfluxDbSqlConstant.AS_VALUE; + InfluxDbSqlConstant.AS + + this.getColumnName(resultEntity, LambdaUtil.columnToString(columnName)) + + StrPool.C_SPACE; selectColumns.add(selectFragment); return this; } @@ -882,8 +887,11 @@ public class InfluxQueryWrapper { * @return InfluxQueryWrapper * 输出 columnName */ - public InfluxQueryWrapper groupBy(ICFunction columnName) { - groupColumn.add(this.getColumnName(measurement, LambdaUtil.columnToString(columnName))); + @SafeVarargs + public final InfluxQueryWrapper groupBy(ICFunction... columnName) { + for (ICFunction tricFunction : columnName) { + groupColumn.add(this.getColumnName(measurement, LambdaUtil.columnToString(tricFunction))); + } return this; }