OpenHAB
/
openhab-addons
mirror of https://github.com/openhab/openhab-addons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[rrd4j] Fix unit retrieval for group items (#17054) 

Reported on the forum

Signed-off-by: Jan N. Klug <github@klug.nrw>
pull/17289/head
J-N-K 2024-07-14 12:18:06 +02:00 committed by Leo Siepel
parent 76be5a9204
commit 5f3e3ecaf2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bundles/org.openhab.persistence.rrd4j/src/main/java/org/openhab/persistence/rrd4j/internal/RRD4jPersistenceService.java
View File

@ -443,6 +443,9 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
Unit<?> unit = null; Unit<?> unit = null;
try { try {
item = itemRegistry.getItem(itemName); item = itemRegistry.getItem(itemName);
if (item instanceof GroupItem groupItem) {
item = groupItem.getBaseItem();
}
if (item instanceof NumberItem numberItem) { if (item instanceof NumberItem numberItem) {
// we already retrieve the unit here once as it is a very costly operation, // we already retrieve the unit here once as it is a very costly operation,
// see https://github.com/openhab/openhab-addons/issues/8928 // see https://github.com/openhab/openhab-addons/issues/8928
@ -631,11 +634,14 @@ public class RRD4jPersistenceService implements QueryablePersistenceService {
} }
} }
/**
* Get the state Mapper for a given item
*
* @param item the item (in case of a group item, the base item has to be supplied)
* @param unit the unit to use
* @return the state mapper
*/
private <Q extends Quantity<Q>> DoubleFunction<State> toStateMapper(@Nullable Item item, @Nullable Unit<Q> unit) { private <Q extends Quantity<Q>> DoubleFunction<State> toStateMapper(@Nullable Item item, @Nullable Unit<Q> unit) {
if (item instanceof GroupItem groupItem) {
item = groupItem.getBaseItem();
}
if (item instanceof SwitchItem && !(item instanceof DimmerItem)) { if (item instanceof SwitchItem && !(item instanceof DimmerItem)) {
return (value) -> OnOffType.from(value != 0.0d); return (value) -> OnOffType.from(value != 0.0d);
} else if (item instanceof ContactItem) { } else if (item instanceof ContactItem) {