This commit is contained in:
2023-05-18 19:57:27 +08:00
parent 90e33036f4
commit 690e16247d

View File

@@ -829,13 +829,13 @@ public class InfluxQueryWrapper {
* @return InfluxQueryWrapper * @return InfluxQueryWrapper
* 输出 (columnName = columnValue or columnName = columnValue or columnName = columnValue ) * 输出 (columnName = columnValue or columnName = columnValue or columnName = columnValue )
*/ */
public <T, R> InfluxQueryWrapper or(ICFunction<T, R> fieldName, List<Object> columnValues) { public <T, R, O> InfluxQueryWrapper or(ICFunction<T, R> fieldName, List<O> columnValues) {
if (CollectionUtil.isEmpty(columnValues)) { if (CollectionUtil.isEmpty(columnValues)) {
throw new RuntimeException("查询数值集合为空,请校验!"); throw new RuntimeException("查询数值集合为空,请校验!");
} }
String columnName = this.getColumnName(measurement, LambdaUtil.columnToString(fieldName)); String columnName = this.getColumnName(measurement, LambdaUtil.columnToString(fieldName));
List<String> orConditionList = new ArrayList<>(); List<String> orConditionList = new ArrayList<>();
for (Object columnValue : columnValues) { for (O columnValue : columnValues) {
String selectConditionFragment = columnName + InfluxDbSqlConstant.EQ; String selectConditionFragment = columnName + InfluxDbSqlConstant.EQ;
if (columnValue instanceof String) { if (columnValue instanceof String) {
//需要用单引号包装下 //需要用单引号包装下
@@ -899,8 +899,6 @@ public class InfluxQueryWrapper {
} }
/********************* [WHERE_clause] [GROUP_BY_clause] [ORDER_BY_clause] [LIMIT_clause] [OFFSET_clause] [SLIMIT_clause] [SOFFSET_clause]*********************/ /********************* [WHERE_clause] [GROUP_BY_clause] [ORDER_BY_clause] [LIMIT_clause] [OFFSET_clause] [SLIMIT_clause] [SOFFSET_clause]*********************/
/*** /***