From a535ecd904eb1c329679a7c5bfafb4ff0b0337ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=B2?= Date: Thu, 28 Aug 2025 14:49:34 +0500 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=8B=D1=82=D0=B0=D1=8E=D1=81=D1=8C=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D1=8F=D1=82=D1=8C=20=D0=BA=D0=B0=D0=BA=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B0=D0=B4=D1=82=D1=8C=20=D0=B0=D1=80?= =?UTF-8?q?=D0=B3=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/working_database.py | 46 ++++++++--------------------------------- 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/app/working_database.py b/app/working_database.py index 7693212..f556d9a 100644 --- a/app/working_database.py +++ b/app/working_database.py @@ -62,34 +62,6 @@ class SimpleDB: try: with self.pool.acquire() as connection: with connection.cursor() as cursor: - # Полная информация о процедуре - query = """ - SELECT - a.argument_name, - a.data_type, - a.data_length, - a.data_precision, - a.data_scale, - a.in_out, - a.position, - a.default_value - FROM user_arguments a - WHERE a.object_name = UPPER(:proc_name) - ORDER BY a.overload, a.position - """ - - cursor.execute(query, proc_name='P_RK_SEND_JSON_LIST_FACEACC') - results = cursor.fetchall() - - print(f"Метаданные процедуры 'P_RK_SEND_JSON_LIST_FACEACC:") - for row in results: - print(f" Параметр: {row[0]}") - print(f" Тип данных: {row[1]}") - print(f" Направление: {row[5]}") - print(f" Позиция: {row[6]}") - if row[7]: - print(f" Значение по умолчанию: {row[7]}") - print(" " + "-"*30) # Передача данных в БД for id, value in dict_data.items(): if len(value) != 5: @@ -99,21 +71,21 @@ class SimpleDB: if date_from_str: date_from = parser.parse(date_from_str).date() #date_from = str(date_from.strftime('%d.%m.%Y')) - else: date_from = parser.parse('01.01.2000') + else: date_from = '01.01.2000' if date_to_str: date_to = parser.parse(date_to_str).date() #date_to = str(date_to.strftime('%d.%m.%Y')) - else: date_to = parser.parse('01.01.2000') + else: date_to = parser.parse('01.01.2000').date() print("Вывод отправляемых агрументов: ", id, organ, names, date_from, date_to, ver) print(type(int(id)), type(organ), type(names), type(date_from), type(date_to), type(ver)) - + cursor.callproc('P_RK_SEND_JSON_LIST_FACEACC', [ - int(id), - organ, - names, - date_from, - date_to, - ver, + 1, + "organ", + "names", + "date_from", + "date_to", + "1.0", ]) except Error as e: raise HTTPException(status_code=500, detail=f"Database error: {e}")