public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[linky] Set channel to UNDEF when data not yet available (#9774) 

Fix #9666

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
This commit is contained in:
lolodomo 2021-01-12 22:17:35 +01:00 committed by GitHub
parent e3ae01df91
commit 36e7366d27
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bundles/org.openhab.binding.linky/src/main/java/org/openhab/binding/linky/internal/handler/LinkyHandler.java
View File

@ -16,6 +16,7 @@ import static org.openhab.binding.linky.internal.LinkyBindingConstants.*;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.time.temporal.WeekFields; import java.time.temporal.WeekFields;
@ -214,9 +215,11 @@ public class LinkyHandler extends BaseThingHandler {
*/ */
private synchronized void updateDailyData() { private synchronized void updateDailyData() {
if (isLinked(YESTERDAY)) { if (isLinked(YESTERDAY)) {
cachedDailyData.getValue().ifPresent(values -> { cachedDailyData.getValue().ifPresentOrElse(values -> {
Aggregate days = values.aggregats.days; Aggregate days = values.aggregats.days;
updateKwhChannel(YESTERDAY, days.datas.get(days.datas.size() - 1)); updateKwhChannel(YESTERDAY, days.datas.get(days.datas.size() - 1));
}, () -> {
updateKwhChannel(YESTERDAY, Double.NaN);
}); });
} }
} }
@ -226,7 +229,7 @@ public class LinkyHandler extends BaseThingHandler {
*/ */
private synchronized void updateWeeklyData() { private synchronized void updateWeeklyData() {
if (isLinked(LAST_WEEK) || isLinked(THIS_WEEK)) { if (isLinked(LAST_WEEK) || isLinked(THIS_WEEK)) {
cachedDailyData.getValue().ifPresent(values -> { cachedDailyData.getValue().ifPresentOrElse(values -> {
Aggregate days = values.aggregats.days; Aggregate days = values.aggregats.days;
int idxLast = days.periodes.get(days.periodes.size() - 1).dateDebut.get(weekFields.dayOfWeek()) == 7 ? 2 int idxLast = days.periodes.get(days.periodes.size() - 1).dateDebut.get(weekFields.dayOfWeek()) == 7 ? 2
: 1; : 1;
@ -239,6 +242,13 @@ public class LinkyHandler extends BaseThingHandler {
} else { } else {
updateKwhChannel(THIS_WEEK, 0.0); updateKwhChannel(THIS_WEEK, 0.0);
} }
}, () -> {
if (ZonedDateTime.now().get(weekFields.dayOfWeek()) == 1) {
updateKwhChannel(THIS_WEEK, 0.0);
updateKwhChannel(LAST_WEEK, Double.NaN);
} else {
updateKwhChannel(THIS_WEEK, Double.NaN);
}
}); });
} }
} }
@ -248,7 +258,7 @@ public class LinkyHandler extends BaseThingHandler {
*/ */
private synchronized void updateMonthlyData() { private synchronized void updateMonthlyData() {
if (isLinked(LAST_MONTH) || isLinked(THIS_MONTH)) { if (isLinked(LAST_MONTH) || isLinked(THIS_MONTH)) {
cachedMonthlyData.getValue().ifPresent(values -> { cachedMonthlyData.getValue().ifPresentOrElse(values -> {
Aggregate months = values.aggregats.months; Aggregate months = values.aggregats.months;
updateKwhChannel(LAST_MONTH, months.datas.get(0)); updateKwhChannel(LAST_MONTH, months.datas.get(0));
if (months.datas.size() > 1) { if (months.datas.size() > 1) {
@ -256,6 +266,13 @@ public class LinkyHandler extends BaseThingHandler {
} else { } else {
updateKwhChannel(THIS_MONTH, 0.0); updateKwhChannel(THIS_MONTH, 0.0);
} }
}, () -> {
if (ZonedDateTime.now().getDayOfMonth() == 1) {
updateKwhChannel(THIS_MONTH, 0.0);
updateKwhChannel(LAST_MONTH, Double.NaN);
} else {
updateKwhChannel(THIS_MONTH, Double.NaN);
}
}); });
} }
} }
@ -265,7 +282,7 @@ public class LinkyHandler extends BaseThingHandler {
*/ */
private synchronized void updateYearlyData() { private synchronized void updateYearlyData() {
if (isLinked(LAST_YEAR) || isLinked(THIS_YEAR)) { if (isLinked(LAST_YEAR) || isLinked(THIS_YEAR)) {
cachedYearlyData.getValue().ifPresent(values -> { cachedYearlyData.getValue().ifPresentOrElse(values -> {
Aggregate years = values.aggregats.years; Aggregate years = values.aggregats.years;
updateKwhChannel(LAST_YEAR, years.datas.get(0)); updateKwhChannel(LAST_YEAR, years.datas.get(0));
if (years.datas.size() > 1) { if (years.datas.size() > 1) {
@ -273,6 +290,13 @@ public class LinkyHandler extends BaseThingHandler {
} else { } else {
updateKwhChannel(THIS_YEAR, 0.0); updateKwhChannel(THIS_YEAR, 0.0);
} }
}, () -> {
if (ZonedDateTime.now().getDayOfYear() == 1) {
updateKwhChannel(THIS_YEAR, 0.0);
updateKwhChannel(LAST_YEAR, Double.NaN);
} else {
updateKwhChannel(THIS_YEAR, Double.NaN);
}
}); });
} }
} }