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 2022-11-01 18:18:38 +08:00
parent 1f36074090
commit 6a4e1d9617
2 changed files with 9 additions and 0 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/ThingPropertyDetail.java
View File

@ -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;

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

@ -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()
);
}