This commit is contained in:
2023-05-05 14:23:26 +08:00
parent f37cff3e9e
commit 9ce0b0cd12

View File

@@ -888,7 +888,7 @@ public class InfluxQueryWrapper {
* 输出 columnName * 输出 columnName
*/ */
@SafeVarargs @SafeVarargs
public final <T, R> InfluxQueryWrapper groupBy(ICFunction<T, R>... columnName) { public final <T, R> InfluxQueryWrapper groupBy(ICFunction<T, R>... columnName) {
for (ICFunction<T, R> tricFunction : columnName) { for (ICFunction<T, R> tricFunction : columnName) {
groupColumn.add(this.getColumnName(measurement, LambdaUtil.columnToString(tricFunction))); groupColumn.add(this.getColumnName(measurement, LambdaUtil.columnToString(tricFunction)));
} }
@@ -996,17 +996,7 @@ public class InfluxQueryWrapper {
*/ */
private String getColumnName(Class<?> clazz, String fieldName) { private String getColumnName(Class<?> clazz, String fieldName) {
Field field = this.getTargetClassField(clazz, fieldName); Field field = this.getTargetClassField(clazz, fieldName);
Column column = field.getAnnotation(Column.class); return getColumnName(field);
//数据库字段
String influxColumn;
if (Objects.isNull(column)) {
//没有注解,就用属性名
influxColumn = fieldName;
} else {
//获取注解映射的名称
influxColumn = column.name();
}
return influxColumn;
} }