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

修复查询事件条件错误

This commit is contained in:
zhouhao 2023-01-10 15:12:09 +08:00
parent 661281b6ff
commit a0e1b6bad6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,7 @@ public abstract class AbstractQueryOperations implements QueryOperations {
public Mono<PagerResult<ThingEvent>> queryEventPage(@Nonnull String eventId,
@Nonnull QueryParamEntity param,
boolean format) {
Query<?, QueryParamEntity> query = param.toNestQuery();
Query<?, QueryParamEntity> query = param.toNestQuery(this::applyQuery);
String metric;
if (settings.getEvent().eventIsAllInOne()) {
metric = metricBuilder.createEventAllInOneMetric(thingType, thingTemplateId, thingId);
@ -213,7 +213,7 @@ public abstract class AbstractQueryOperations implements QueryOperations {
@Nonnull
@Override
public final Flux<ThingEvent> queryEvent(@Nonnull String eventId, @Nonnull QueryParamEntity param, boolean format) {
Query<?, QueryParamEntity> query = param.toNestQuery();
Query<?, QueryParamEntity> query = param.toNestQuery(this::applyQuery);
String metric;
if (settings.getEvent().eventIsAllInOne()) {
metric = metricBuilder.createEventAllInOneMetric(thingType, thingTemplateId, thingId);