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

fix alias + add username sender

Browse Source
This commit is contained in:
alex
2025-08-27 22:43:36 +02:00
parent 730869ef1f
commit 1ce6c7fd09
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbddl/received.ddl
View File

@@ -2,18 +2,18 @@ DROP TABLE ase_lar.received;
CREATE TABLE `received` ( CREATE TABLE `received` (
`id` int NOT NULL AUTO_INCREMENT, `id` int NOT NULL AUTO_INCREMENT,
`filename` varchar(100) COLLATE utf8mb4_general_ci NOT NULL, `username` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`unit_name` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, `filename` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`unit_type` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, `unit_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`tool_name` varchar(30) COLLATE utf8mb4_general_ci NOT NULL, `unit_type` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`tool_type` varchar(30) 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_data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`tool_info` json DEFAULT NULL, `tool_info` json DEFAULT NULL,
`locked` int DEFAULT '0', `locked` int DEFAULT '0',
`status` int DEFAULT '0', `status` int DEFAULT '0',
`matlab_timestamp` timestamp NULL DEFAULT NULL,
`inserted_at` timestamp NULL DEFAULT CURRENT_TIMESTAMP, `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, `start_elab_at` timestamp NULL DEFAULT NULL,
`elaborated_at` timestamp NULL DEFAULT NULL, `elaborated_at` timestamp NULL DEFAULT NULL,
`sent_raw_at` timestamp NULL DEFAULT NULL, `sent_raw_at` timestamp NULL DEFAULT NULL,

2
env/ftp.ini vendored
View File

@@ -28,7 +28,7 @@
[tool] [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 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] 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] [csv]
Infos = IP|Subnet|Gateway Infos = IP|Subnet|Gateway

2
src/utils/connect/file_management.py
View File

@@ -74,7 +74,7 @@ def on_file_received(self: object, file: str) -> None:
tool_info = f'{{"Stazione": "{cfg.ts_pini_path_match.get(stazione)}"}}' tool_info = f'{{"Stazione": "{cfg.ts_pini_path_match.get(stazione)}"}}'
try: 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.commit()
conn.close() conn.close()