+ 
+ + 3. Step 3 + + 
+ + 4. Step 4 + + If you have multiple linky on your account like me, you will have to repeat the procedure for each linky. + Don't select the two linky in the same procedure, it will not work ! + + 
+ + 5. Step 5 + + 
+ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step1.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step1.png new file mode 100644 index 00000000000..163203d2a77 Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step1.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2.png new file mode 100644 index 00000000000..e726253cc8b Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2b.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2b.png new file mode 100644 index 00000000000..41adb8c2bef Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2b.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2c.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2c.png new file mode 100644 index 00000000000..1c100a54846 Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2c.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2d.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2d.png new file mode 100644 index 00000000000..77c014801c2 Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step2d.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step3.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step3.png new file mode 100644 index 00000000000..6684b6b6ca9 Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step3.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step3b.png b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step3b.png new file mode 100644 index 00000000000..4d2eb813df6 Binary files /dev/null and b/bundles/org.openhab.binding.linky/doc/myelectricaldata/connectlinky-myelectricaldata-step3b.png differ diff --git a/bundles/org.openhab.binding.linky/doc/myelectricaldata/index.md b/bundles/org.openhab.binding.linky/doc/myelectricaldata/index.md new file mode 100644 index 00000000000..d6b3e33f5a7 --- /dev/null +++ b/bundles/org.openhab.binding.linky/doc/myelectricaldata/index.md @@ -0,0 +1,29 @@ + 2. Step 2 + + 
+ 
+ + 3. Step 3 + + 
+ + 4. Step 4 + + If you have multiple linky on your account like me, you will have to repeat the procedure for each linky. + Don't select the two linky in the same procedure, it will not work ! + + 
+ + 5. Step 5 + + 
+ + 6. Step 6 + + 
+ + 7. Step 7 + + 
+ + diff --git a/bundles/org.openhab.binding.linky/pom.xml b/bundles/org.openhab.binding.linky/pom.xml index 17787276d8a..2ff88b44998 100644 --- a/bundles/org.openhab.binding.linky/pom.xml +++ b/bundles/org.openhab.binding.linky/pom.xml @@ -17,14 +17,4 @@
Call to Enedis failed with error: %s
"; + + // Keys present in the index.html + private static final String KEY_AUTHORIZE_URI = "authorize.uri"; + private static final String KEY_RETRIEVE_TOKEN_URI = "retrieveToken.uri"; + private static final String KEY_REDIRECT_URI = "redirectUri"; + private static final String KEY_CODE = "code.Value"; + private static final String KEY_PRMID = "prmId.Value"; + private static final String KEY_PRMID_OPTION = "prmId.Option"; + private static final String KEY_AUTHORIZED_USER = "authorizedUser"; + private static final String KEY_CB_DISPLAY_CONFIRMATION = "cb.displayConfirmation"; + private static final String KEY_CB_DISPLAY_ERROR = "cb.displayError"; + private static final String KEY_CB_DISPLAY_INSTRUCTION = "cb.displayInstruction"; + private static final String KEY_ERROR = "error"; + private static final String KEY_PAGE_REFRESH = "pageRefresh"; + private static final String TEMPLATE_PATH = "templates/"; + + private final Logger logger = LoggerFactory.getLogger(LinkyAuthServlet.class); + private final String index; + private final String enedisStep1; + private final String enedisStep2; + private final String enedisStep3; + private final String myelectricaldataStep1; + private final String myelectricaldataStep2; + private final String myelectricaldataStep3; + + private BridgeRemoteApiHandler apiBridgeHandler; + + public LinkyAuthServlet(BridgeRemoteApiHandler apiBridgeHandler) throws LinkyException { + this.apiBridgeHandler = apiBridgeHandler; + + try { + this.index = readTemplate("index.html"); + this.enedisStep1 = readTemplate("enedis-step1.html"); + this.enedisStep2 = readTemplate("enedis-step2.html"); + this.enedisStep3 = readTemplate("enedis-step3-cb.html"); + this.myelectricaldataStep1 = readTemplate("myelectricaldata-step1.html"); + this.myelectricaldataStep2 = readTemplate("myelectricaldata-step2.html"); + this.myelectricaldataStep3 = readTemplate("myelectricaldata-step3.html"); + } catch (IOException e) { + throw new LinkyException("unable to initialize auth servlet", e); + } + } + + /** + * Reads a template from file and returns the content as String. + * + * @param templateName name of the template file to read + * @return The content of the template file + * @throws IOException thrown when an HTML template could not be read + */ + private String readTemplate(String templateName) throws IOException { + final URL url = apiBridgeHandler.getBundleContext().getBundle().getEntry(TEMPLATE_PATH + templateName); + + if (url == null) { + throw new FileNotFoundException( + String.format("Cannot find {}' - failed to initialize Linky servlet".formatted(templateName))); + } else { + try (InputStream inputStream = url.openStream()) { + return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); + } + } + } + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { + logger.debug("Linky auth callback servlet received GET request {}.", req.getRequestURI()); + final Map
+
+
+
+
+
+
+ 
+
+
+
+
+
+ 
+
+
+ +
+
+
+
+
+
+ +
+OpenHAB Linky binding for Enedis
+
+
+
+
+
+
+
+ OpenHAB Linky binding for Enedis
+
+
+
+
+
+
+
+
Plugin Linky / Enedis pour Openhab
++ +
Ce plugin permet d'exploiter vos données de consommation éléctrique fournis par Enedis au sein d'OpenHab.
+ +Enedis gère le réseau d’électricité jusqu’au compteur d’électricité
+ Enedis est le gestionnaire du réseau public de distribution d’électricité sur 95% du territoire français continental.
Grace à ce plugin, vous serez en mesure de :
+ +-
+
- Consulter les informations contractuelles liés à votre compte. +
- Créer des graphes de consommation par jour / semaine / mois / annéee. +
- Consulter la puissance maximum utilisé sur une période donnée. +
- Load curve +
+
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/templates/enedis-step2.html b/bundles/org.openhab.binding.linky/src/main/resources/templates/enedis-step2.html
new file mode 100644
index 00000000000..92737e5b6d4
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/templates/enedis-step2.html
@@ -0,0 +1,174 @@
+
+
+
+
+
+${pageRefresh}
+
+
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/templates/enedis-step3-cb.html b/bundles/org.openhab.binding.linky/src/main/resources/templates/enedis-step3-cb.html
new file mode 100644
index 00000000000..5efc6abb2a5
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/templates/enedis-step3-cb.html
@@ -0,0 +1,174 @@
+
+
+
+
+
+${pageRefresh}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+ Plugin Linky / Enedis pour Openhab
++ +
+ 
+
+
+
+ Pour utiliser ce plugin, vous devez donner votre accord pour qu'Enedis transmette vos données.
+ +
+ Enedis est le gestionnaire du réseau public de distribution d’électricité sur 95% du territoire français continental.
+ Enedis gère le réseau d’électricité jusqu’au compteur d’électricité.
+
+
Pour donner votre autorisation, vous devez avoir un compte personnel Enedis.
+ Ce compte vous permet également de suivre et gérer vos données de consommation [ou production en fonction de votre service] d’électricité.
Si vous n'avez pas de compte, vous pouvez le créer depuis cette page.
+ Munissez-vous pour celà de votre facture d’électricité pour créer votre espace.
En cliquant sur le bouton ci-dessous, vous allez accéder à votre compte personnel Enedis où vous pourrez donner votre accord pour qu’Enedis nous transmette vos données.
+Une fois cette opération effectué, vous serez rediriger vers une page de confirmation.
+ +
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +Authorize openHAB Linky binding for Enedis
+
+
+
+
+
+
+
+ OpenHAB Linky binding for Enedis
+
+
+
+
+
+
+
+
Plugin Linky / Enedis pour Openhab
++ +
+ Vous avez autorisé l'accès pour le compteur Linky : ${prmId.Value}
+ Vous pouvez maintenant utiliser le plugin Linky avec Enedis.
+ ${authorizedUser} +
+
+ + Vous pouvez maintenant utiliser le plugin Linky avec Enedis.
+ ${authorizedUser} +
+ Une erreur c'est produite:
+ ${error}
+
+
+
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/templates/index.html b/bundles/org.openhab.binding.linky/src/main/resources/templates/index.html
new file mode 100644
index 00000000000..931dda58164
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/templates/index.html
@@ -0,0 +1,152 @@
+
+
+
+
+ +
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step1.html b/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step1.html
new file mode 100644
index 00000000000..73ccb9f95b8
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step1.html
@@ -0,0 +1,181 @@
+
+
+
+
+
+${pageRefresh}
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ + Merci de sélectionner votre provider +
+ +
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+OpenHAB Linky binding for Enedis
+
+
+
+
+
+
+
+ OpenHAB Linky binding for Enedis
+
+
+
+
+
+
+
+
Plugin Linky / MyElectricalData pour Openhab
++ +
Ce plugin permet d'exploiter vos données de consommation éléctrique fournis par Enedis au sein d'OpenHab.
+ +Enedis gère le réseau d’électricité jusqu’au compteur d’électricité
+ Enedis est le gestionnaire du réseau public de distribution d’électricité sur 95% du territoire français continental.
Grace à ce plugin, vous serez en mesure de :
+ +-
+
- Consulter les informations contractuelles liés à votre compte. +
- Créer des graphes de consommation par jour / semaine / mois / annéee. +
- Consulter la puissance maximum utilisé sur une période donnée. +
- Load curve +
+
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step2.html b/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step2.html
new file mode 100644
index 00000000000..ab19fedc48f
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step2.html
@@ -0,0 +1,169 @@
+
+
+
+
+
+${pageRefresh}
+
+
+
+
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step3.html b/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step3.html
new file mode 100644
index 00000000000..73e8d8692c4
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/templates/myelectricaldata-step3.html
@@ -0,0 +1,201 @@
+
+
+
+
+
+${pageRefresh}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+ Plugin Linky / MyElectricalData pour Openhab
++ +
+
+
+
+
+ Pour utiliser ce plugin, vous devez donner votre accord pour qu'Enedis transmette vos données.
+ +Pour donner votre autorisation, vous devez avoir un compte personnel Enedis.
+ Ce compte vous permet également de suivre et gérer vos données de consommation [ou production en fonction de votre service] d’électricité.
Si vous n'avez pas de compte, vous pouvez le créer depuis cette page.
+ Munissez-vous pour celà de votre facture d’électricité pour créer votre espace.
En cliquant sur le bouton ci-dessous, vous allez accéder à votre compte personnel Enedis où vous pourrez donner votre accord pour qu’Enedis nous transmette vos données.
+Une fois cette opération effectué, vous devez vous rendre manuellement sur cette page pour terminer la procédure.
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
Plugin Linky / MyElectricalData pour Openhab
++ +
+ Vous pouvez maintenant utiliser le plugin Linky avec MyElectricalData.
+ ${authorizedUser}
+
+
+
+ Une erreur c'est produite:
+ ${error}
+
+
+
+
+ +
+ +
+
+
+
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/MyElectricalData.png b/bundles/org.openhab.binding.linky/src/main/resources/web/MyElectricalData.png
new file mode 100644
index 00000000000..42a96f45a42
Binary files /dev/null and b/bundles/org.openhab.binding.linky/src/main/resources/web/MyElectricalData.png differ
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/boutonEnedis.png b/bundles/org.openhab.binding.linky/src/main/resources/web/boutonEnedis.png
new file mode 100644
index 00000000000..fb54715051b
Binary files /dev/null and b/bundles/org.openhab.binding.linky/src/main/resources/web/boutonEnedis.png differ
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/enedis.png b/bundles/org.openhab.binding.linky/src/main/resources/web/enedis.png
new file mode 100644
index 00000000000..a28c3f31bbd
Binary files /dev/null and b/bundles/org.openhab.binding.linky/src/main/resources/web/enedis.png differ
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/enedisSmall.png b/bundles/org.openhab.binding.linky/src/main/resources/web/enedisSmall.png
new file mode 100644
index 00000000000..159281d2c39
Binary files /dev/null and b/bundles/org.openhab.binding.linky/src/main/resources/web/enedisSmall.png differ
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/linky.png b/bundles/org.openhab.binding.linky/src/main/resources/web/linky.png
new file mode 100644
index 00000000000..fd718ea417e
Binary files /dev/null and b/bundles/org.openhab.binding.linky/src/main/resources/web/linky.png differ
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/linky.svg b/bundles/org.openhab.binding.linky/src/main/resources/web/linky.svg
new file mode 100644
index 00000000000..4fd5ed95509
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/web/linky.svg
@@ -0,0 +1,76 @@
+
+
\ No newline at end of file
diff --git a/bundles/org.openhab.binding.linky/src/main/resources/web/openhab_logo.svg b/bundles/org.openhab.binding.linky/src/main/resources/web/openhab_logo.svg
new file mode 100644
index 00000000000..0401d16f698
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/main/resources/web/openhab_logo.svg
@@ -0,0 +1,733 @@
+
+
diff --git a/bundles/org.openhab.binding.linky/src/test/java/org/openhab/binding/linky/internal/handler/ThingLinkyRemoteHandlerTest.java b/bundles/org.openhab.binding.linky/src/test/java/org/openhab/binding/linky/internal/handler/ThingLinkyRemoteHandlerTest.java
new file mode 100644
index 00000000000..3933b20b405
--- /dev/null
+++ b/bundles/org.openhab.binding.linky/src/test/java/org/openhab/binding/linky/internal/handler/ThingLinkyRemoteHandlerTest.java
@@ -0,0 +1,332 @@
+/*
+ * Copyright (c) 2010-2025 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.binding.linky.internal.handler;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.when;
+
+import java.time.LocalDateTime;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.openhab.binding.linky.internal.config.LinkyThingRemoteConfiguration;
+import org.openhab.binding.linky.internal.dto.IntervalReading;
+import org.openhab.binding.linky.internal.dto.MeterReading;
+import org.openhab.core.i18n.LocaleProvider;
+import org.openhab.core.i18n.TimeZoneProvider;
+import org.openhab.core.thing.Thing;
+
+/**
+ * The {@link ThingLinkyRemoteHandler} is responsible for extra validation for Raw things.
+ *
+ * @author Laurent Arnal - Initial contribution
+ */
+@ExtendWith(MockitoExtension.class)
+public class ThingLinkyRemoteHandlerTest {
+
+ private ThingLinkyRemoteHandler handler;
+
+ @Mock
+ LocaleProvider localProvider;
+
+ @Mock
+ Thing thing;
+
+ @Mock
+ TimeZoneProvider tzProvider;
+
+ @Mock
+ LinkyThingRemoteConfiguration config;
+
+ @BeforeEach
+ public void setUp() {
+ when(thing.getConfiguration()).thenReturn(new LinkyThingRemoteConfiguration());
+ }
+
+ /*
+ * @AfterAll
+ * public void tearDown() {
+ * // handler.dispose();
+ * }
+ */
+
+ public @Nullable MeterReading getMeterReadingAfterChecks(ThingLinkyRemoteHandler handler,
+ @Nullable MeterReading meterReading) {
+ return handler.getMeterReadingAfterChecks(meterReading);
+ }
+
+ @Test
+ public void testBase() {
+ handler = new ThingLinkyRemoteHandler(thing, localProvider, tzProvider);
+
+ MeterReading mr = getMeterReadingAfterChecks(handler, null);
+ assertEquals(mr, null);
+ }
+
+ @Test
+ public void testValidRange1() {
+ handler = new ThingLinkyRemoteHandler(thing, localProvider, tzProvider);
+
+ MeterReading mr = new MeterReading();
+ mr.baseValue = new IntervalReading[75];
+ LocalDateTime startDate = LocalDateTime.of(2025, 1, 1, 0, 0, 0);
+ for (int idx = 0; idx < 75; idx++) {
+ mr.baseValue[idx] = new IntervalReading();
+ mr.baseValue[idx].value = Double.valueOf(idx);
+ mr.baseValue[idx].date = startDate.plusDays(idx);
+ }
+
+ mr = getMeterReadingAfterChecks(handler, mr);
+ assertNotEquals(mr, null);
+ if (mr == null) {
+ return;
+ }
+ assertNotEquals(mr.weekValue, null);
+ assertNotEquals(mr.monthValue, null);
+ assertNotEquals(mr.yearValue, null);
+
+ assertEquals(mr.weekValue.length, 11);
+ assertEquals(mr.monthValue.length, 3);
+ assertEquals(mr.yearValue.length, 1);
+
+ assertEquals(mr.weekValue[0].value, 10);
+
+ assertEquals(mr.weekValue[1].value, 56);
+ assertEquals(mr.weekValue[1].date, LocalDateTime.of(2025, 1, 6, 0, 0, 0));
+
+ assertEquals(mr.weekValue[4].value, 203);
+ assertEquals(mr.weekValue[4].date, LocalDateTime.of(2025, 1, 27, 0, 0, 0));
+
+ assertEquals(mr.weekValue[10].value, 497);
+ assertEquals(mr.weekValue[10].date, LocalDateTime.of(2025, 3, 10, 0, 0, 0));
+
+ assertEquals(mr.monthValue[0].value, 465);
+ assertEquals(mr.monthValue[0].date, LocalDateTime.of(2025, 1, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[1].value, 1246);
+ assertEquals(mr.monthValue[1].date, LocalDateTime.of(2025, 2, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[2].value, 1064);
+ assertEquals(mr.monthValue[2].date, LocalDateTime.of(2025, 3, 1, 0, 0, 0));
+
+ assertEquals(mr.yearValue[0].value, 2775);
+ assertEquals(mr.yearValue[0].date, LocalDateTime.of(2025, 1, 1, 0, 0, 0));
+ }
+
+ @Test
+ public void testValidRange2() {
+ handler = new ThingLinkyRemoteHandler(thing, localProvider, tzProvider);
+
+ MeterReading mr = new MeterReading();
+ mr.baseValue = new IntervalReading[128];
+ LocalDateTime startDate = LocalDateTime.of(2024, 11, 6, 0, 0, 0);
+ for (int idx = 0; idx < 128; idx++) {
+ mr.baseValue[idx] = new IntervalReading();
+ mr.baseValue[idx].value = Double.valueOf(idx);
+ mr.baseValue[idx].date = startDate.plusDays(idx);
+ }
+
+ mr = getMeterReadingAfterChecks(handler, mr);
+ assertNotEquals(mr, null);
+ if (mr == null) {
+ return;
+ }
+ assertNotEquals(mr.weekValue, null);
+ assertNotEquals(mr.monthValue, null);
+ assertNotEquals(mr.yearValue, null);
+
+ assertEquals(mr.weekValue.length, 19);
+ assertEquals(mr.monthValue.length, 5);
+ assertEquals(mr.yearValue.length, 2);
+
+ assertEquals(mr.weekValue[0].value, 10);
+ assertEquals(mr.weekValue[0].date, LocalDateTime.of(2024, 11, 6, 0, 0, 0));
+
+ assertEquals(mr.weekValue[2].value, 105);
+ assertEquals(mr.weekValue[2].date, LocalDateTime.of(2024, 11, 18, 0, 0, 0));
+
+ assertEquals(mr.weekValue[6].value, 301);
+ assertEquals(mr.weekValue[6].date, LocalDateTime.of(2024, 12, 16, 0, 0, 0));
+
+ assertEquals(mr.weekValue[8].value, 399);
+ assertEquals(mr.weekValue[8].date, LocalDateTime.of(2024, 12, 30, 0, 0, 0));
+
+ assertEquals(mr.weekValue[12].value, 595);
+ assertEquals(mr.weekValue[12].date, LocalDateTime.of(2025, 01, 27, 0, 0, 0));
+
+ assertEquals(mr.weekValue[18].value, 502);
+ assertEquals(mr.weekValue[18].date, LocalDateTime.of(2025, 03, 10, 0, 0, 0));
+
+ assertEquals(mr.monthValue[0].value, 300);
+ assertEquals(mr.monthValue[0].date, LocalDateTime.of(2024, 11, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[1].value, 1240);
+ assertEquals(mr.monthValue[1].date, LocalDateTime.of(2024, 12, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[2].value, 2201);
+ assertEquals(mr.monthValue[2].date, LocalDateTime.of(2025, 1, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[3].value, 2814);
+ assertEquals(mr.monthValue[3].date, LocalDateTime.of(2025, 2, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[4].value, 1573);
+ assertEquals(mr.monthValue[4].date, LocalDateTime.of(2025, 3, 1, 0, 0, 0));
+
+ assertEquals(mr.yearValue[0].value, 1540);
+ assertEquals(mr.yearValue[0].date, LocalDateTime.of(2024, 1, 1, 0, 0, 0));
+
+ assertEquals(mr.yearValue[1].value, 6588);
+ assertEquals(mr.yearValue[1].date, LocalDateTime.of(2025, 1, 1, 0, 0, 0));
+ }
+
+ @Test
+ public void testValidRange3() {
+ handler = new ThingLinkyRemoteHandler(thing, localProvider, tzProvider);
+
+ MeterReading mr = new MeterReading();
+ mr.baseValue = new IntervalReading[716];
+ LocalDateTime startDate = LocalDateTime.of(2023, 03, 29, 0, 0, 0);
+ for (int idx = 0; idx < 716; idx++) {
+ mr.baseValue[idx] = new IntervalReading();
+ mr.baseValue[idx].value = Double.valueOf(idx);
+ mr.baseValue[idx].date = startDate.plusDays(idx);
+ }
+
+ mr = getMeterReadingAfterChecks(handler, mr);
+ assertNotEquals(mr, null);
+ if (mr == null) {
+ return;
+ }
+
+ assertNotEquals(mr.weekValue, null);
+ assertNotEquals(mr.monthValue, null);
+ assertNotEquals(mr.yearValue, null);
+
+ assertEquals(mr.weekValue.length, 103);
+ assertEquals(mr.monthValue.length, 25);
+ assertEquals(mr.yearValue.length, 3);
+
+ assertEquals(mr.weekValue[0].value, 10);
+ assertEquals(mr.weekValue[0].date, LocalDateTime.of(2023, 03, 29, 0, 0, 0));
+
+ assertEquals(mr.weekValue[2].value, 105);
+ assertEquals(mr.weekValue[2].date, LocalDateTime.of(2023, 04, 10, 0, 0, 0));
+
+ assertEquals(mr.weekValue[15].value, 742);
+ assertEquals(mr.weekValue[15].date, LocalDateTime.of(2023, 07, 10, 0, 0, 0));
+
+ assertEquals(mr.weekValue[39].value, 1918);
+ assertEquals(mr.weekValue[39].date, LocalDateTime.of(2023, 12, 25, 0, 0, 0));
+
+ assertEquals(mr.weekValue[56].value, 2751);
+ assertEquals(mr.weekValue[56].date, LocalDateTime.of(2024, 04, 22, 0, 0, 0));
+
+ assertEquals(mr.weekValue[90].value, 4417);
+ assertEquals(mr.weekValue[90].date, LocalDateTime.of(2024, 12, 16, 0, 0, 0));
+
+ assertEquals(mr.weekValue[97].value, 4760);
+ assertEquals(mr.weekValue[97].date, LocalDateTime.of(2025, 02, 03, 0, 0, 0));
+
+ assertEquals(mr.weekValue[102].value, 2854);
+ assertEquals(mr.weekValue[102].date, LocalDateTime.of(2025, 03, 10, 0, 0, 0));
+
+ assertEquals(mr.monthValue[0].value, 3);
+ assertEquals(mr.monthValue[0].date, LocalDateTime.of(2023, 03, 01, 0, 0, 0));
+
+ assertEquals(mr.monthValue[5].value, 4340);
+ assertEquals(mr.monthValue[5].date, LocalDateTime.of(2023, 8, 01, 0, 0, 0));
+
+ assertEquals(mr.monthValue[9].value, 8122);
+ assertEquals(mr.monthValue[9].date, LocalDateTime.of(2023, 12, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[10].value, 9083);
+ assertEquals(mr.monthValue[10].date, LocalDateTime.of(2024, 01, 01, 0, 0, 0));
+
+ assertEquals(mr.monthValue[17].value, 15686);
+ assertEquals(mr.monthValue[17].date, LocalDateTime.of(2024, 8, 01, 0, 0, 0));
+
+ assertEquals(mr.monthValue[22].value, 20429);
+ assertEquals(mr.monthValue[22].date, LocalDateTime.of(2025, 01, 01, 0, 0, 0));
+
+ assertEquals(mr.monthValue[23].value, 19278);
+ assertEquals(mr.monthValue[23].date, LocalDateTime.of(2025, 02, 01, 0, 0, 0));
+
+ assertEquals(mr.monthValue[24].value, 9217);
+ assertEquals(mr.monthValue[24].date, LocalDateTime.of(2025, 03, 01, 0, 0, 0));
+
+ assertEquals(mr.yearValue[0].value, 38503);
+ assertEquals(mr.yearValue[0].date, LocalDateTime.of(2023, 1, 1, 0, 0, 0));
+
+ assertEquals(mr.yearValue[1].value, 168543);
+ assertEquals(mr.yearValue[1].date, LocalDateTime.of(2024, 1, 1, 0, 0, 0));
+
+ assertEquals(mr.yearValue[2].value, 48924);
+ assertEquals(mr.yearValue[2].date, LocalDateTime.of(2025, 1, 1, 0, 0, 0));
+ }
+
+ @Test
+ public void testValidRange4() {
+ handler = new ThingLinkyRemoteHandler(thing, localProvider, tzProvider);
+
+ MeterReading mr = new MeterReading();
+ mr.baseValue = new IntervalReading[35];
+ LocalDateTime startDate = LocalDateTime.of(2025, 02, 10, 0, 0, 0);
+ for (int idx = 0; idx < 35; idx++) {
+ mr.baseValue[idx] = new IntervalReading();
+ mr.baseValue[idx].value = Double.valueOf(idx);
+ mr.baseValue[idx].date = startDate.plusDays(idx);
+ }
+
+ mr = getMeterReadingAfterChecks(handler, mr);
+ assertNotEquals(mr, null);
+ if (mr == null) {
+ return;
+ }
+
+ assertNotEquals(mr.weekValue, null);
+ assertNotEquals(mr.monthValue, null);
+ assertNotEquals(mr.yearValue, null);
+
+ assertEquals(mr.weekValue.length, 5);
+ assertEquals(mr.monthValue.length, 2);
+ assertEquals(mr.yearValue.length, 1);
+
+ assertEquals(mr.weekValue[0].value, 21);
+ assertEquals(mr.weekValue[0].date, LocalDateTime.of(2025, 2, 10, 0, 0, 0));
+
+ assertEquals(mr.weekValue[1].value, 70);
+ assertEquals(mr.weekValue[1].date, LocalDateTime.of(2025, 2, 17, 0, 0, 0));
+
+ assertEquals(mr.weekValue[2].value, 119);
+ assertEquals(mr.weekValue[2].date, LocalDateTime.of(2025, 2, 24, 0, 0, 0));
+
+ assertEquals(mr.weekValue[3].value, 168);
+ assertEquals(mr.weekValue[3].date, LocalDateTime.of(2025, 3, 3, 0, 0, 0));
+
+ assertEquals(mr.weekValue[4].value, 217);
+ assertEquals(mr.weekValue[4].date, LocalDateTime.of(2025, 3, 10, 0, 0, 0));
+
+ assertEquals(mr.monthValue[0].value, 171);
+ assertEquals(mr.monthValue[0].date, LocalDateTime.of(2025, 2, 1, 0, 0, 0));
+
+ assertEquals(mr.monthValue[1].value, 424);
+ assertEquals(mr.monthValue[1].date, LocalDateTime.of(2025, 3, 1, 0, 0, 0));
+
+ assertEquals(mr.yearValue[0].value, 595);
+ assertEquals(mr.yearValue[0].date, LocalDateTime.of(2025, 1, 1, 0, 0, 0));
+ }
+}
+ Vous devez maintenant récupérer le token depuis MyElectricalData. +
+ ++ Pour ce faire : +
-
+
- Sélectionner le numéro de prmId dans la combobox ci-dessous. +
- Cliquer sur le bouton "Retrive token". +
+ +
+ +