From 5f9f9a3a1b9fda178dfe3486bbba26651ac2c7e2 Mon Sep 17 00:00:00 2001 From: gitadmin Date: Sat, 15 Nov 2025 22:45:53 +0300 Subject: [PATCH] =?UTF-8?q?[=D0=92=D0=9E=D0=9B=D0=9A]=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B5=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D0=B9=20=D0=B7=D0=B0=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D0=BD=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D0=B5=20id=5Fevent=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=B7=D0=B1?= =?UTF-8?q?=D0=B5=D0=B3=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B1?= =?UTF-8?q?=D0=BB=D0=B5=D0=BC=20=D1=81=20=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA?= =?UTF-8?q?=D1=81=D0=B0=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- volk_load.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/volk_load.py b/volk_load.py index 440675d..372a8fc 100644 --- a/volk_load.py +++ b/volk_load.py @@ -292,13 +292,16 @@ def load_events_by_category(category_id): log_message("Проверка структуры базы данных") ensure_database_structure() - # Получаем максимальный number для данной категории, чтобы продолжить нумерацию + # Получаем максимальный number и id_event для данной категории, чтобы продолжить нумерацию cursor.execute( - "SELECT MAX(number) as max_number FROM events WHERE unit_name = %s", + "SELECT MAX(number) as max_number, MAX(id_event) as max_id_event FROM events WHERE unit_name = %s", (category_id,) ) result = cursor.fetchone() - start_number = (result['max_number'] or 0) + 1 + max_number = result['max_number'] or 0 + max_id_event = result['max_id_event'] or 0 + # Используем максимальное значение из обоих полей для начала нумерации + start_number = max(max_number, max_id_event) + 1 # Обработка событий current_number = start_number @@ -324,11 +327,11 @@ def load_events_by_category(category_id): if not existing: # Вставка новой записи - # Используем 0 для id_event, так как его нет в JSON + # Используем одинаковое значение для id_event и number cursor.execute( """INSERT INTO events (id_event, number, unit_name, name, about, about_social_picture, authors) VALUES (%s, %s, %s, %s, %s, %s, %s)""", - (0, current_number, unit_name, name, about, about_social_picture, authors) + (current_number, current_number, unit_name, name, about, about_social_picture, authors) ) inserted_count += 1 log_message(f"Добавление: Событие '{name}', номер: {current_number}, категория: {category_id}")