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:
zhou-hao 2020-09-30 14:38:32 +08:00
parent 38404d9086
commit 8bef25b655
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/DevicePropertyMeasurement.java
View File

@ -69,8 +69,6 @@ class DevicePropertyMeasurement extends StaticMeasurement {
: QueryParamEntity
.newQuery()
.doPaging(0, history)
.where("deviceId", deviceId)
.and("property", metadata.getId())
.execute(q -> deviceDataService.queryProperty(deviceId, q, metadata.getId()))
.map(data -> SimpleMeasurementValue.of(data, data.getTimestamp()))
.sort(MeasurementValue.sort());

2
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/DefaultDeviceDataService.java
View File

@ -104,7 +104,7 @@ public class DefaultDeviceDataService implements DeviceDataService {
return this
.getDeviceStrategy(deviceId)
.flatMapMany(strategy -> strategy.queryProperty(deviceId, query));
.flatMapMany(strategy -> strategy.queryProperty(deviceId, query, property));
}
@Override