suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: 优化设备数据查询

This commit is contained in:
zhouhao 2023-12-28 15:57:46 +08:00
parent 73fa7607e9
commit 0b6c8451d3
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/things/ElasticSearchRowModeQueryOperations.java
View File

@ -104,8 +104,10 @@ class ElasticSearchRowModeQueryOperations extends RowModeQueryOperationsBase {
if (property == null || thingId == null || value == null) {
return null;
}
return ThingPropertyDetail
.of(TimeSeriesData.of(ts, data), properties.get(property));
return applyProperty(ThingPropertyDetail
.of(TimeSeriesData.of(ts, data), properties.get(property)),
data);
});
}

30
jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/operations/RowModeQueryOperationsBase.java
View File

@ -41,8 +41,11 @@ public abstract class RowModeQueryOperationsBase extends AbstractQueryOperations
return this
.doQuery(metric, query)
.mapNotNull(data -> ThingPropertyDetail
.of(data, properties.get(data.getString(ThingsDataConstants.COLUMN_PROPERTY_ID, null))))
.mapNotNull(data -> this
.applyProperty(
ThingPropertyDetail
.of(data, properties.get(data.getString(ThingsDataConstants.COLUMN_PROPERTY_ID, null))),
data.getData()))
;
}
@ -58,10 +61,24 @@ public abstract class RowModeQueryOperationsBase extends AbstractQueryOperations
.clone()
.toQuery()
.and(ThingsDataConstants.COLUMN_PROPERTY_ID, e.getKey()))
.mapNotNull(data -> ThingPropertyDetail.of(data, properties.get(data.getString(ThingsDataConstants.COLUMN_PROPERTY_ID, null)))),
.mapNotNull(data -> this
.applyProperty(
ThingPropertyDetail
.of(data, properties.get(data.getString(ThingsDataConstants.COLUMN_PROPERTY_ID, null))),
data.getData())),
16);
}
protected ThingPropertyDetail applyProperty(ThingPropertyDetail detail, Map<String, Object> data) {
if (detail == null) {
return null;
}
if (detail.getThingId() == null) {
detail.thingId((String) data.get(metricBuilder.getThingIdProperty()));
}
return detail;
}
@Override
protected final Mono<PagerResult<ThingPropertyDetail>> queryPropertyPage(@Nonnull QueryParamEntity param,
@Nonnull ThingMetadata metadata,
@ -76,8 +93,11 @@ public abstract class RowModeQueryOperationsBase extends AbstractQueryOperations
return this
.doQueryPage(metric,
query,
data -> ThingPropertyDetail
.of(data, properties.get(data.getString(ThingsDataConstants.COLUMN_PROPERTY_ID, null))));
data -> this
.applyProperty(
ThingPropertyDetail
.of(data, properties.get(data.getString(ThingsDataConstants.COLUMN_PROPERTY_ID, null))),
data.getData()));
}
@Override