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

支持format

This commit is contained in:
zhou-hao 2020-04-26 17:25:09 +08:00
parent 894918a667
commit 7e280eb2d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
package org.jetlinks.community.device.measurements;
import org.hswebframework.utils.time.DateFormatter;
import org.hswebframework.web.api.crud.entity.QueryParamEntity;
import org.jetlinks.core.message.property.ReadPropertyMessageReply;
import org.jetlinks.core.message.property.ReportPropertyMessage;
@ -207,7 +208,10 @@ class DevicePropertyMeasurement extends StaticMeasurement {
.gte("timestamp", parameter.getDate("from").orElse(null))
.lte("timestamp", parameter.getDate("to").orElse(null)))
.execute(timeSeriesService::query)
.map(data -> SimpleMeasurementValue.of(createValue(data.get("value").orElse(null)), data.getTimestamp()))
.map(data -> SimpleMeasurementValue.of(
createValue(data.get("value").orElse(null)),
DateFormatter.toString(new Date(data.getTimestamp()), parameter.getString("format","HH:mm:ss")),
data.getTimestamp()))
.sort(MeasurementValue.sort());
});
}