alex/ASE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gestione GD

Browse Source
This commit is contained in:
alex
2025-07-27 19:25:42 +02:00
parent cee070d237
commit dc20713cad
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/csv/data_preparation.py
View File

@@ -205,16 +205,19 @@ async def make_gd_matrix(cfg: object, id: int, pool: object) -> list:
for riga in [riga for riga in righe if ';|;' in riga and 'No RX' not in riga and '.-' not in riga and 'File Creation' not in riga and riga.isprintable()]: for riga in [riga for riga in righe if ';|;' in riga and 'No RX' not in riga and '.-' not in riga and 'File Creation' not in riga and riga.isprintable()]:
timestamp, rilevazioni = riga.split(';|;',1) timestamp, rilevazioni = riga.split(';|;',1)
EventDate, EventTime = timestamp.split(' ') EventDate, EventTime = timestamp.split(' ')
logger.info(f"GD id {id}: {pattern} {rilevazioni}") #logger.debug(f"GD id {id}: {pattern} {rilevazioni}")
if re.search(pattern, rilevazioni): if re.search(pattern, rilevazioni):
batlevel, temperature, rssi = rilevazioni.split(';') batlevel, temperature, rssi = rilevazioni.split(';')
logger.info(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {rssi}") #logger.debug(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {rssi}")
matrice_valori.append([UnitName, ToolNameID, 1, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + [rssi] + ([None] * 18))
elif all(char == ';' for char in rilevazioni): elif all(char == ';' for char in rilevazioni):
pass pass
elif ';|;' in rilevazioni: elif ';|;' in rilevazioni:
unit_metrics, data = rilevazioni.split(';|;') unit_metrics, data = rilevazioni.split(';|;')
batlevel, temperature = unit_metrics.split(';') batlevel, temperature = unit_metrics.split(';')
logger.info(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {data}") #logger.debug(f"GD id {id}: {EventDate}, {EventTime}, {batlevel}, {temperature}, {data}")
valori = data.split(';')
matrice_valori.append([UnitName, ToolNameID.replace("GD", "DT"), 2, date_check.conforma_data(EventDate), EventTime, batlevel, temperature] + valori + ([None] * (19 - len(valori))))
else: else:
logger.warning(f"GD id {id}: dati non trattati - {rilevazioni}") logger.warning(f"GD id {id}: dati non trattati - {rilevazioni}")

1
utils/database/__init__.py
View File

@@ -15,4 +15,5 @@ FLAG_TO_TIMESTAMP = {
WorkflowFlags.SENT_ELAB_DATA: "sent_elab_at" WorkflowFlags.SENT_ELAB_DATA: "sent_elab_at"
} }
# Dimensione degli split della matrice per il caricamento
BATCH_SIZE = 1000 BATCH_SIZE = 1000

2
utils/database/loader_action.py
View File

@@ -84,7 +84,7 @@ async def load_data(cfg: object, matrice_valori: list, pool: object) -> bool:
except Exception as e: except Exception as e:
await conn.rollback() await conn.rollback()
logger.error(f"Error: {e}.") logger.error(f"Error: {e}.")
logger.error(f"Matrice valori da inserire: {batch}.") # logger.error(f"Matrice valori da inserire: {batch}.")
if e.args[0] == 1213: # Deadlock detected if e.args[0] == 1213: # Deadlock detected
logger.warning( logger.warning(