diff --git a/CloudConnection.py b/CloudConnection.py index e159db9..76672bc 100644 --- a/CloudConnection.py +++ b/CloudConnection.py @@ -49,6 +49,16 @@ class CloudConnection: break return data + def get_statistic_data(self, inverter_id): + url = f"https://app.api.apsystemsema.com:9223/aps-api-web/api/v2/data/device/ezInverter/statistic/{inverter_id}" + while True: + result = requests.get(url, headers=self._auth_header) + self._handle_api_return_codes(result) + if result.json()["code"] == 0: + data = result.json()["data"] + break + return data + def get_inverter(self): url = f"https://app.api.apsystemsema.com:9223/aps-api-web/api/v2/data/device/ezInverter/list/{self._user_id}" inverter = [] diff --git a/Inverter.py b/Inverter.py index aec8dbd..e5d9de1 100644 --- a/Inverter.py +++ b/Inverter.py @@ -17,11 +17,17 @@ class Inverter: async def gather(self): while self.gather_data: realtime_data: dict = self.cloud_connection.get_realtime_data(self.inverter_id) - data = InverterData( + rt_data = InverterData( self.inverter_id, realtime_data ) - await self._queue.put(data) + statistic: dict = self.cloud_connection.get_statistic_data(self.inverter_id) + st_data = InverterData( + self.inverter_id, + statistic + ) + await self._queue.put(rt_data) + await self._queue.put(st_data) await asyncio.sleep(60) diff --git a/docker-compose.yml b/docker-compose.yml index 256a8c5..8c32a11 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.9" +version: "3.3" services: ez1cloud2mqtt: image: ez1cloud2mqtt