From 6a4e1d9617bfe3ecbb33b677778ec38805cd4fa7 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Tue, 1 Nov 2022 18:18:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E5=BC=8F=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jetlinks/community/things/data/ThingPropertyDetail.java | 4 ++++ .../data/operations/ColumnModeQueryOperationsBase.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/ThingPropertyDetail.java b/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/ThingPropertyDetail.java index b028bd42..acb9a176 100644 --- a/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/ThingPropertyDetail.java +++ b/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/ThingPropertyDetail.java @@ -80,6 +80,10 @@ public class ThingPropertyDetail implements ThingProperty { return this; } + public ThingPropertyDetail createTime(long createTime) { + this.createTime = createTime; + return this; + } public ThingPropertyDetail formatTime(String formatTime) { this.formatTime = formatTime; diff --git a/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/operations/ColumnModeQueryOperationsBase.java b/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/operations/ColumnModeQueryOperationsBase.java index d5fe05b6..d3385820 100644 --- a/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/operations/ColumnModeQueryOperationsBase.java +++ b/jetlinks-components/things-component/src/main/java/org/jetlinks/community/things/data/operations/ColumnModeQueryOperationsBase.java @@ -3,6 +3,7 @@ package org.jetlinks.community.things.data.operations; import org.hswebframework.ezorm.core.dsl.Query; import org.hswebframework.web.api.crud.entity.PagerResult; import org.hswebframework.web.api.crud.entity.QueryParamEntity; +import org.jetlinks.community.things.data.ThingsDataConstants; import org.jetlinks.core.metadata.PropertyMetadata; import org.jetlinks.core.things.ThingMetadata; import org.jetlinks.core.things.ThingsRegistry; @@ -60,6 +61,8 @@ public abstract class ColumnModeQueryOperationsBase extends AbstractQueryOperati .next(ThingPropertyDetail .of(value, entry.getValue()) .thingId(data.getString(metricBuilder.getThingIdProperty(), null)) + .timestamp(data.getTimestamp()) + .createTime(data.getLong(ThingsDataConstants.COLUMN_CREATE_TIME,data.getTimestamp())) .generateId() )); } @@ -94,6 +97,8 @@ public abstract class ColumnModeQueryOperationsBase extends AbstractQueryOperati data -> ThingPropertyDetail .of(data.get(property).orElse(null), properties.get(property)) .thingId(data.getString(metricBuilder.getThingIdProperty(), null)) + .timestamp(data.getTimestamp()) + .createTime(data.getLong(ThingsDataConstants.COLUMN_CREATE_TIME, data.getTimestamp())) .generateId() ); }