From 2e7c5d7c3f105a080fc353669324a6f31581d224 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 16 May 2025 12:39:14 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BB=A2=E9=80=81=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E8=B5=B7=E5=8B=95=E6=9D=A1=E4=BB=B6=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-transfer-receive-file/src/main.py | 19 +++++++++++++------ .../src/manager/jskult_hdke_tbl_manager.py | 6 +++--- .../src/system_var/constants.py | 2 +- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-transfer-receive-file/src/main.py b/ecs/jskult-transfer-receive-file/src/main.py index 6285c209..5d1512c0 100644 --- a/ecs/jskult-transfer-receive-file/src/main.py +++ b/ecs/jskult-transfer-receive-file/src/main.py @@ -18,18 +18,25 @@ def exec(): # 転送データリストを初期化する。 transfer_file_lists = {"transfer_list": []} - hdke_tbl_manager = JskultHdkeTblManager() # ② 日付テーブルのステータスを確認する + hdke_tbl_manager = JskultHdkeTblManager() try: - if not hdke_tbl_manager.can_run_process(): - logger.error('日次バッチ処理中またはdump取得が正常終了していないため、データ転送処理を終了します。') - return constants.BATCH_EXIT_CODE_SUCCESS - # 処理日を取得 - _, _, syor_date = hdke_tbl_manager.get_batch_statuses() + # 日次バッチ処置中フラグ、dump処理状態区分、処理日を取得 + batch_processing_flag, dump_status_kbn, syor_date = hdke_tbl_manager.get_batch_statuses() except BatchOperationException as e: logger.exception(f'日付テーブル取得（異常終了）{e}') return constants.BATCH_EXIT_CODE_SUCCESS + # 日次バッチ処理中の場合、後続の処理は行わない + if batch_processing_flag == constants.BATCH_ACTF_BATCH_START: + logger.error('日次バッチ処理中のため、日次バッチ処理を終了します。') + return constants.BATCH_EXIT_CODE_SUCCESS + + # dump取得が正常終了していない場合、後続の処理は行わない + if dump_status_kbn != constants.DUMP_STATUS_KBN_COMPLETE: + logger.error('dump取得が正常終了していないため、日次バッチ処理を終了します。') + return constants.BATCH_EXIT_CODE_SUCCESS + logger.info(f'処理日＝{syor_date}') logger.info('I-2 日次バッチ処理中フラグ更新') # バッチ処理中に更新 diff --git a/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py b/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py index 91fdf899..51bc30c6 100644 --- a/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py +++ b/ecs/jskult-transfer-receive-file/src/manager/jskult_hdke_tbl_manager.py @@ -52,7 +52,7 @@ class JskultHdkeTblManager: sql = """\ UPDATE src07.hdke_tbl SET - bch_actf = :in_processing, + bch_actf = :start, updater = CURRENT_USER(), update_date = NOW() """ @@ -60,7 +60,7 @@ class JskultHdkeTblManager: self._db.connect() self._db.to_jst() self._db.execute( - sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) + sql, {'start': constants.BATCH_ACTF_BATCH_START}) except DBException as e: raise BatchOperationException(e) finally: @@ -113,7 +113,7 @@ class JskultHdkeTblManager: finally: self._db.disconnect() # 日次バッチ処理中の場合、後続の処理は行わない - if batch_processing_flag == constants.BATCH_ACTF_BATCH_IN_PROCESSING: + if batch_processing_flag == constants.BATCH_ACTF_BATCH_START: return False # dump取得が正常終了していない場合、後続の処理は行わない if dump_status_kbn != constants.DUMP_STATUS_KBN_COMPLETE: diff --git a/ecs/jskult-transfer-receive-file/src/system_var/constants.py b/ecs/jskult-transfer-receive-file/src/system_var/constants.py index d5538a80..45535a41 100644 --- a/ecs/jskult-transfer-receive-file/src/system_var/constants.py +++ b/ecs/jskult-transfer-receive-file/src/system_var/constants.py @@ -4,7 +4,7 @@ BATCH_EXIT_CODE_SUCCESS = 0 # バッチ処理中フラグ：未処理 BATCH_ACTF_BATCH_UNPROCESSED = '0' # バッチ処理中フラグ：処理中 -BATCH_ACTF_BATCH_IN_PROCESSING = '1' +BATCH_ACTF_BATCH_START = '1' # dump取得状態区分：未処理 DUMP_STATUS_KBN_UNPROCESSED = '0' # dump取得状態区分：dump取得正常終了