fix GD

utils/csv/data_preparation.py

@@ -1,6 +1,7 @@
 #!.venv/bin/python
 from utils.database.nodes_query import get_nodes_type
 from utils.timestamp.date_check import normalizza_data, normalizza_orario
+from utils.database.loader_action import find_nearest_timestamp
 import logging
 import re
 
@@ -224,8 +225,11 @@ async def make_gd_matrix(cfg: object, id: int, pool: object) -> list:
             unit_metrics, data = rilevazioni.split(';|;')
             batlevel, temperature = unit_metrics.split(';')
             #logger.debug(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {data}")
+
+            dt_timestamp, dt_batlevel, dt_temperature = await find_nearest_timestamp(cfg, {"timestamp": f"{normalizza_data(EventDate)} {normalizza_orario(EventTime)}", "unit": UnitName, "tool": ToolNameID.replace("GD", "DT"), "node_num": 1}, pool)
+            EventDate, EventTime = dt_timestamp.strftime('%Y-%m-%d %H:%M:%S').split(' ')
             valori = data.split(';')
-            matrice_valori.append([UnitName, ToolNameID.replace("GD", "DT"), 2, normalizza_data(EventDate), normalizza_orario(EventTime), batlevel, temperature] + valori + ([None] * (19 - len(valori))))
+            matrice_valori.append([UnitName, ToolNameID.replace("GD", "DT"), 2, EventDate, EventTime, float(dt_batlevel), float(dt_temperature)] + valori + ([None] * (16 - len(valori))) + [batlevel, temperature, None])
         else:
             logger.warning(f"GD id {id}: dati non trattati - {rilevazioni}")