demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-27 07:41:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

[jpa] Fix return value for UoM items (#16977)

Browse Source 
Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2024-07-01 23:24:04 +02:00 committed by GitHub
parent 0a7ed2bf89
commit 82379f0de6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bundles/org.openhab.persistence.jpa/src/main/java/org/openhab/persistence/jpa/internal/JpaHistoricItem.java
View File

@ -19,6 +19,8 @@ import java.time.ZonedDateTime;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.measure.Unit;
import org.eclipse.jdt.annotation.NonNullByDefault; import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
import org.openhab.core.library.items.ContactItem; import org.openhab.core.library.items.ContactItem;
@ -34,6 +36,7 @@ import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.OpenClosedType; import org.openhab.core.library.types.OpenClosedType;
import org.openhab.core.library.types.PercentType; import org.openhab.core.library.types.PercentType;
import org.openhab.core.library.types.PointType; import org.openhab.core.library.types.PointType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.types.StringListType; import org.openhab.core.library.types.StringListType;
import org.openhab.core.library.types.StringType; import org.openhab.core.library.types.StringType;
import org.openhab.core.persistence.HistoricItem; import org.openhab.core.persistence.HistoricItem;
@ -100,8 +103,10 @@ public class JpaHistoricItem implements HistoricItem {
*/ */
public static HistoricItem fromPersistedItem(JpaPersistentItem pItem, Item item) { public static HistoricItem fromPersistedItem(JpaPersistentItem pItem, Item item) {
State state; State state;
if (item instanceof NumberItem) { if (item instanceof NumberItem numberItem) {
state = new DecimalType(Double.valueOf(pItem.getValue())); Unit<?> unit = numberItem.getUnit();
double value = Double.parseDouble(pItem.getValue());
state = (unit == null) ? new DecimalType(value) : new QuantityType<>(value, unit);
} else if (item instanceof DimmerItem) { } else if (item instanceof DimmerItem) {
state = new PercentType(Integer.parseInt(pItem.getValue())); state = new PercentType(Integer.parseInt(pItem.getValue()));
} else if (item instanceof SwitchItem) { } else if (item instanceof SwitchItem) {