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

Merge remote-tracking branch 'origin/2.10' into 2.10

This commit is contained in:
zhouhao 2025-06-24 11:03:08 +08:00
parent 9f15c5333b a8b211ad21
commit bed9337550
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetlinks-components/timescaledb-component/src/main/java/org/jetlinks/community/timescaledb/thing/TimescaleDBColumnModeDDLOperations.java
View File

@ -15,6 +15,7 @@
*/
package org.jetlinks.community.timescaledb.thing;
import com.google.common.collect.Sets;
import lombok.extern.slf4j.Slf4j;
import org.hswebframework.ezorm.rdb.codec.DateTimeCodec;
import org.hswebframework.ezorm.rdb.metadata.RDBIndexMetadata;
@ -23,7 +24,6 @@ import org.hswebframework.ezorm.rdb.metadata.RDBTableMetadata;
import org.hswebframework.ezorm.rdb.operator.DatabaseOperator;
import org.hswebframework.ezorm.rdb.operator.ddl.TableBuilder;
import org.jetlinks.core.metadata.PropertyMetadata;
import org.jetlinks.community.Interval;
import org.jetlinks.community.things.data.ThingsDataConstants;
import org.jetlinks.community.things.data.operations.ColumnModeDDLOperationsBase;
import org.jetlinks.community.things.data.operations.DataSettings;
@ -44,6 +44,11 @@ public class TimescaleDBColumnModeDDLOperations extends ColumnModeDDLOperationsB
private final TimescaleDBThingsDataProperties properties;
static Set<String> ignoreColumn = Sets.newHashSet(
ThingsDataConstants.COLUMN_ID,
ThingsDataConstants.COLUMN_MESSAGE_ID
);
public TimescaleDBColumnModeDDLOperations(String thingType,
String templateId,
String thingId,
@ -70,6 +75,9 @@ public class TimescaleDBColumnModeDDLOperations extends ColumnModeDDLOperationsB
List<String> partitions = new ArrayList<>();
partitions.add(ThingsDataConstants.COLUMN_THING_ID);
for (PropertyMetadata property : properties) {
if (ignoreColumn.contains(property.getId())) {
continue;
}
builder
.addColumn(property.getId())
.custom(column -> {