|
|
@ -21,11 +21,16 @@ import lombok.Data; |
|
|
import lombok.NoArgsConstructor; |
|
|
import lombok.NoArgsConstructor; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
import org.apache.commons.lang3.math.NumberUtils; |
|
|
import org.apache.commons.lang3.math.NumberUtils; |
|
|
|
|
|
import org.thingsboard.script.api.tbel.TbelCfArg; |
|
|
|
|
|
import org.thingsboard.script.api.tbel.TbelCfTsDoubleVal; |
|
|
|
|
|
import org.thingsboard.script.api.tbel.TbelCfTsRollingArg; |
|
|
import org.thingsboard.server.common.data.kv.BasicKvEntry; |
|
|
import org.thingsboard.server.common.data.kv.BasicKvEntry; |
|
|
|
|
|
import org.thingsboard.server.common.data.kv.DataType; |
|
|
import org.thingsboard.server.common.data.kv.KvEntry; |
|
|
import org.thingsboard.server.common.data.kv.KvEntry; |
|
|
import org.thingsboard.server.common.data.kv.TsKvEntry; |
|
|
import org.thingsboard.server.common.data.kv.TsKvEntry; |
|
|
import org.thingsboard.server.common.util.ProtoUtils; |
|
|
import org.thingsboard.server.common.util.ProtoUtils; |
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
import java.util.List; |
|
|
import java.util.List; |
|
|
import java.util.Map; |
|
|
import java.util.Map; |
|
|
import java.util.TreeMap; |
|
|
import java.util.TreeMap; |
|
|
@ -41,7 +46,7 @@ public class TsRollingArgumentEntry implements ArgumentEntry { |
|
|
|
|
|
|
|
|
private static final int MAX_ROLLING_ARGUMENT_ENTRY_SIZE = 1000; |
|
|
private static final int MAX_ROLLING_ARGUMENT_ENTRY_SIZE = 1000; |
|
|
|
|
|
|
|
|
private TreeMap<Long, BasicKvEntry> tsRecords = new TreeMap<>(); |
|
|
private TreeMap<Long, Double> tsRecords = new TreeMap<>(); |
|
|
|
|
|
|
|
|
public TsRollingArgumentEntry(List<TsKvEntry> kvEntries) { |
|
|
public TsRollingArgumentEntry(List<TsKvEntry> kvEntries) { |
|
|
kvEntries.forEach(tsKvEntry -> addTsRecord(tsKvEntry.getTs(), tsKvEntry)); |
|
|
kvEntries.forEach(tsKvEntry -> addTsRecord(tsKvEntry.getTs(), tsKvEntry)); |
|
|
@ -62,15 +67,7 @@ public class TsRollingArgumentEntry implements ArgumentEntry { |
|
|
@JsonIgnore |
|
|
@JsonIgnore |
|
|
@Override |
|
|
@Override |
|
|
public Object getValue() { |
|
|
public Object getValue() { |
|
|
return tsRecords.entrySet() |
|
|
return tsRecords; |
|
|
.stream() |
|
|
|
|
|
.collect(Collectors.toMap( |
|
|
|
|
|
Map.Entry::getKey, |
|
|
|
|
|
entry -> entry.getValue().getValue(), |
|
|
|
|
|
(oldValue, newValue) -> oldValue, |
|
|
|
|
|
TreeMap::new |
|
|
|
|
|
)); |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
@ -78,45 +75,57 @@ public class TsRollingArgumentEntry implements ArgumentEntry { |
|
|
return new TsRollingArgumentEntry(new TreeMap<>(tsRecords)); |
|
|
return new TsRollingArgumentEntry(new TreeMap<>(tsRecords)); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
|
public TbelCfArg toTbelCfArg() { |
|
|
|
|
|
List<TbelCfTsDoubleVal> values = new ArrayList<>(tsRecords.size()); |
|
|
|
|
|
for (var e : tsRecords.entrySet()) { |
|
|
|
|
|
values.add(new TbelCfTsDoubleVal(e.getKey(), e.getValue())); |
|
|
|
|
|
} |
|
|
|
|
|
return new TbelCfTsRollingArg(values); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public boolean updateEntry(ArgumentEntry entry) { |
|
|
public boolean updateEntry(ArgumentEntry entry) { |
|
|
if (entry instanceof TsRollingArgumentEntry tsRollingEntry) { |
|
|
if (entry instanceof TsRollingArgumentEntry tsRollingEntry) { |
|
|
return updateTsRollingEntry(tsRollingEntry); |
|
|
updateTsRollingEntry(tsRollingEntry); |
|
|
} else if (entry instanceof SingleValueArgumentEntry singleValueEntry) { |
|
|
} else if (entry instanceof SingleValueArgumentEntry singleValueEntry) { |
|
|
return updateSingleValueEntry(singleValueEntry); |
|
|
updateSingleValueEntry(singleValueEntry); |
|
|
} else { |
|
|
} else { |
|
|
throw new IllegalArgumentException("Unsupported argument entry type for rolling argument entry: " + entry.getType()); |
|
|
throw new IllegalArgumentException("Unsupported argument entry type for rolling argument entry: " + entry.getType()); |
|
|
} |
|
|
} |
|
|
|
|
|
return true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private boolean updateTsRollingEntry(TsRollingArgumentEntry tsRollingEntry) { |
|
|
private void updateTsRollingEntry(TsRollingArgumentEntry tsRollingEntry) { |
|
|
boolean updated = false; |
|
|
for (Map.Entry<Long, Double> tsRecordEntry : tsRollingEntry.getTsRecords().entrySet()) { |
|
|
for (Map.Entry<Long, BasicKvEntry> tsRecordEntry : tsRollingEntry.getTsRecords().entrySet()) { |
|
|
addTsRecord(tsRecordEntry.getKey(), tsRecordEntry.getValue()); |
|
|
updated |= addTsRecordIfAbsent(tsRecordEntry.getKey(), tsRecordEntry.getValue()); |
|
|
|
|
|
} |
|
|
} |
|
|
return updated; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private boolean updateSingleValueEntry(SingleValueArgumentEntry singleValueEntry) { |
|
|
private void updateSingleValueEntry(SingleValueArgumentEntry singleValueEntry) { |
|
|
return addTsRecordIfAbsent(singleValueEntry.getTs(), singleValueEntry.getKvEntryValue()); |
|
|
addTsRecord(singleValueEntry.getTs(), singleValueEntry.getKvEntryValue()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private boolean addTsRecordIfAbsent(Long ts, KvEntry value) { |
|
|
private void addTsRecord(Long ts, KvEntry value) { |
|
|
if (!tsRecords.containsKey(ts)) { |
|
|
switch (value.getDataType()) { |
|
|
addTsRecord(ts, value); |
|
|
case LONG -> value.getLongValue().ifPresent(aLong -> tsRecords.put(ts, aLong.doubleValue())); |
|
|
return true; |
|
|
case DOUBLE -> value.getDoubleValue().ifPresent(aDouble -> tsRecords.put(ts, aDouble)); |
|
|
|
|
|
case BOOLEAN -> value.getBooleanValue().ifPresent(aBoolean -> tsRecords.put(ts, aBoolean ? 1.0 : 0.0)); |
|
|
|
|
|
case STRING -> value.getStrValue().ifPresent(aString -> tsRecords.put(ts, Double.parseDouble(aString))); |
|
|
|
|
|
case JSON -> value.getJsonValue().ifPresent(aString -> tsRecords.put(ts, Double.parseDouble(aString))); |
|
|
|
|
|
//TODO: try catch
|
|
|
} |
|
|
} |
|
|
return false; |
|
|
pollFirstEntryIfNeeded(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void addTsRecord(Long ts, KvEntry value) { |
|
|
private void addTsRecord(Long ts, double value) { |
|
|
if (NumberUtils.isParsable(value.getValue().toString())) { |
|
|
tsRecords.put(ts, value); |
|
|
tsRecords.put(ts, ProtoUtils.basicKvEntryFromKvEntry(value)); |
|
|
pollFirstEntryIfNeeded(); |
|
|
if (tsRecords.size() > MAX_ROLLING_ARGUMENT_ENTRY_SIZE) { |
|
|
} |
|
|
tsRecords.pollFirstEntry(); |
|
|
|
|
|
} |
|
|
private void pollFirstEntryIfNeeded() { |
|
|
} else { |
|
|
if (tsRecords.size() > MAX_ROLLING_ARGUMENT_ENTRY_SIZE) { |
|
|
throw new IllegalArgumentException("Argument type " + getType() + " only supports numeric values."); |
|
|
tsRecords.pollFirstEntry(); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
ViacheslavKlimov
2 years ago