From 1ce6c7fd09c7c91e852ff620eaf7605aaa2e292d Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 27 Aug 2025 22:43:36 +0200 Subject: [PATCH] fix alias + add username sender --- dbddl/received.ddl | 14 +++++++------- env/ftp.ini | 2 +- src/utils/connect/file_management.py | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dbddl/received.ddl b/dbddl/received.ddl index 90d112c..7d51358 100644 --- a/dbddl/received.ddl +++ b/dbddl/received.ddl @@ -2,18 +2,18 @@ DROP TABLE ase_lar.received; CREATE TABLE `received` ( `id` int NOT NULL AUTO_INCREMENT, - `filename` varchar(100) COLLATE utf8mb4_general_ci NOT NULL, - `unit_name` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, - `unit_type` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, - `tool_name` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, - `tool_type` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, + `username` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `filename` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `unit_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `unit_type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `tool_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `tool_type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `tool_data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `tool_info` json DEFAULT NULL, `locked` int DEFAULT '0', `status` int DEFAULT '0', - `matlab_timestamp` timestamp NULL DEFAULT NULL, `inserted_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, - `loaded_at` timestamp DEFAULT NULL, + `loaded_at` timestamp NULL DEFAULT NULL, `start_elab_at` timestamp NULL DEFAULT NULL, `elaborated_at` timestamp NULL DEFAULT NULL, `sent_raw_at` timestamp NULL DEFAULT NULL, diff --git a/env/ftp.ini b/env/ftp.ini index 393e86f..87dae3b 100644 --- a/env/ftp.ini +++ b/env/ftp.ini @@ -28,7 +28,7 @@ [tool] Types = MUX|MUMS|MODB|IPTM|MUSA|LOC|GD|D2W|CR1000X|G301|NESA|GS1|G201|TLP|DSAS|HORTUS|HEALTH-|READINGS-|INTEGRITY MONITOR|MESSPUNKTEPINI_|HIRPINIA|CO_[0-9]{4}_[0-9]|VULINK Names = LOC[0-9]{4}|DT[0-9]{4}|GD[0-9]{4}|[0-9]{18}|MEASUREMENTS_|CHESA_ARCOIRIS_[0-9]*|TS_PS_PETITES_CROISETTES|CO_[0-9]{4}_[0-9] - Alias = CO_:CO|HEALTH-:HEALTH|READINGS-:READINGS|MESSPUNKTEPINI_:MESSPUNKTEPINI| + Alias = CO_:CO|HEALTH-:HEALTH|READINGS-:READINGS|MESSPUNKTEPINI_:MESSPUNKTEPINI [csv] Infos = IP|Subnet|Gateway diff --git a/src/utils/connect/file_management.py b/src/utils/connect/file_management.py index 8fb080d..191a6f0 100644 --- a/src/utils/connect/file_management.py +++ b/src/utils/connect/file_management.py @@ -74,7 +74,7 @@ def on_file_received(self: object, file: str) -> None: tool_info = f'{{"Stazione": "{cfg.ts_pini_path_match.get(stazione)}"}}' try: - cur.execute(f"INSERT INTO {cfg.dbname}.{cfg.dbrectable} (filename, unit_name, unit_type, tool_name, tool_type, tool_data, tool_info) VALUES (%s, %s, %s, %s, %s, %s, %s)", (filename, unit_name.upper(), unit_type.upper(), tool_name.upper(), tool_type.upper(), ''.join(lines), tool_info)) + cur.execute(f"INSERT INTO {cfg.dbname}.{cfg.dbrectable} (username, filename, unit_name, unit_type, tool_name, tool_type, tool_data, tool_info) VALUES (%s,%s, %s, %s, %s, %s, %s, %s)", (self.username, filename, unit_name.upper(), unit_type.upper(), tool_name.upper(), tool_type.upper(), ''.join(lines), tool_info)) conn.commit() conn.close()