瀏覽代碼

增加timeFormat配置

zhou-hao 5 年之前
父節點
當前提交
7cc137e850

+ 1 - 1
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/measurements/DevicePropertyMeasurement.java

@@ -210,7 +210,7 @@ class DevicePropertyMeasurement extends StaticMeasurement {
                         .execute(timeSeriesService::query)
                         .execute(timeSeriesService::query)
                         .map(data -> SimpleMeasurementValue.of(
                         .map(data -> SimpleMeasurementValue.of(
                             createValue(data.get("value").orElse(null)),
                             createValue(data.get("value").orElse(null)),
-                            DateFormatter.toString(new Date(data.getTimestamp()), parameter.getString("format","HH:mm:ss")),
+                            DateFormatter.toString(new Date(data.getTimestamp()), parameter.getString("timeFormat","HH:mm:ss")),
                             data.getTimestamp()))
                             data.getTimestamp()))
                         .sort(MeasurementValue.sort());
                         .sort(MeasurementValue.sort());
                 });
                 });