From 0e191bf686617264a3172ace483274e699c9241b Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Tue, 20 May 2025 12:38:27 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=97=A5=E4=BB=98=E3=83=86=E3=83=BC?= =?UTF-8?q?=E3=83=96=E3=83=AB=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92?= =?UTF-8?q?=E5=85=B1=E9=80=9A=E5=87=A6=E7=90=86=E3=81=A7=E8=A1=8C=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82DCFDSF?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=87=BA=E5=8A=9B=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-ultmarc-io/src/aws/s3.py | 2 +- .../src/batch/batch_functions.py | 111 ----- .../src/batch/ultmarc/output_dcf_dsf_data.py | 425 ++++++++---------- .../src/db/database.py | 2 +- ecs/jskult-batch-ultmarc-io/src/main.py | 32 +- .../src/manager/jskult_hdke_tbl_manager.py | 122 +++++ 6 files changed, 324 insertions(+), 370 deletions(-) delete mode 100644 ecs/jskult-batch-ultmarc-io/src/batch/batch_functions.py create mode 100644 ecs/jskult-batch-ultmarc-io/src/manager/jskult_hdke_tbl_manager.py diff --git a/ecs/jskult-batch-ultmarc-io/src/aws/s3.py b/ecs/jskult-batch-ultmarc-io/src/aws/s3.py index 6203868d..6fe9b14d 100644 --- a/ecs/jskult-batch-ultmarc-io/src/aws/s3.py +++ b/ecs/jskult-batch-ultmarc-io/src/aws/s3.py @@ -170,7 +170,7 @@ class VjskSendBucket(S3Bucket): _bucket_name = environment.VJSK_DATA_BUCKET _send_folder = environment.VJSK_DATA_SEND_FOLDER - def upload_inst_pharm_csv_file(self, vjsk_create_csv: str, csv_file_path: str): + def upload_dcf_dsf_csv_file(self, vjsk_create_csv: str, csv_file_path: str): # S3バケットにファイルを移動 csv_file_name = f'{self._send_folder}/{vjsk_create_csv}' s3_client = S3Client() diff --git a/ecs/jskult-batch-ultmarc-io/src/batch/batch_functions.py b/ecs/jskult-batch-ultmarc-io/src/batch/batch_functions.py deleted file mode 100644 index 43c4760c..00000000 --- a/ecs/jskult-batch-ultmarc-io/src/batch/batch_functions.py +++ /dev/null @@ -1,111 +0,0 @@ -"""バッチ処理の共通関数""" -import logging -import textwrap -from datetime import datetime - -from src.db.database import Database -from src.error.exceptions import BatchOperationException, DBException -from src.system_var import constants - - -def get_batch_statuses() -> tuple[str, str, str]: - """日付テーブルから、以下を取得して返す。 - - 日次バッチ処理中フラグ - - dump取得状況区分 - - 処理日（YYYY/MM/DD） - - Raises: - BatchOperationException: 日付テーブルが取得できないとき、何らかのエラーが発生したとき - - Returns: - tuple[str, str]: [0]日次バッチ処理中フラグ、dump取得状況区分 - """ - db = Database.get_instance() - sql = 'SELECT bch_actf, dump_sts_kbn, src05.get_syor_date() AS syor_date FROM src05.hdke_tbl' - try: - db.connect() - hdke_tbl_result = db.execute_select(sql) - except DBException as e: - raise BatchOperationException(e) - finally: - db.disconnect() - - if len(hdke_tbl_result) == 0: - raise BatchOperationException('日付テーブルが取得できませんでした') - - # 必ず1件取れる - hdke_tbl_record = hdke_tbl_result[0] - batch_processing_flag = hdke_tbl_record['bch_actf'] - dump_status_kbn = hdke_tbl_record['dump_sts_kbn'] - syor_date = hdke_tbl_record['syor_date'] - # 処理日を文字列に変換する - syor_date_str = datetime.strftime(syor_date, '%Y/%m/%d') - - return batch_processing_flag, dump_status_kbn, syor_date_str - - -def update_batch_processing_flag_in_processing() -> None: - """バッチ処理中フラグを処理中に更新する - - Raises: - BatchOperationException: DB操作の何らかのエラー - """ - db = Database.get_instance() - sql = """\ - UPDATE src05.hdke_tbl - SET - bch_actf = :in_processing, - updater = CURRENT_USER(), - update_date = NOW() - """ - try: - db.connect() - db.to_jst() - db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) - except DBException as e: - raise BatchOperationException(e) - finally: - db.disconnect() - - return - - -def update_batch_process_complete() -> None: - """バッチ処理を完了とし、処理日、バッチ処理中フラグ、dump処理状態区分を更新する - - Raises: - BatchOperationException: DB操作の何らかのエラー - """ - db = Database.get_instance() - sql = """\ - UPDATE src05.hdke_tbl - SET - bch_actf = :batch_complete, - dump_sts_kbn = :dump_unprocessed, - syor_date = DATE_FORMAT((src05.get_syor_date() + interval 1 day), '%Y%m%d'), -- +1日 - updater = CURRENT_USER(), - update_date = NOW() - """ - try: - db.connect() - db.to_jst() - db.execute(sql, { - 'batch_complete': constants.BATCH_ACTF_BATCH_UNPROCESSED, - 'dump_unprocessed': constants.DUMP_STATUS_KBN_UNPROCESSED - }) - except DBException as e: - raise BatchOperationException(e) - finally: - db.disconnect() - - return - - -def logging_sql(logger: logging.Logger, sql: str) -> None: - """SQL文をデバッグログで出力する - - Args: - logger (logging.Logger): ロガー - sql (str): SQL文 - """ - logger.debug(f'\n{"-" * 15}\n{textwrap.dedent(sql)[1:-1]}\n{"-" * 15}') diff --git a/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/output_dcf_dsf_data.py b/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/output_dcf_dsf_data.py index 838dae34..350c4837 100644 --- a/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/output_dcf_dsf_data.py +++ b/ecs/jskult-batch-ultmarc-io/src/batch/ultmarc/output_dcf_dsf_data.py @@ -1,271 +1,236 @@ -"""output_vjsk_inst_pharm_data""" +"""DCF DSFデータ作成処理""" + +import csv +import os.path as path +import tempfile from src.aws.s3 import VjskSendBucket from src.batch.common.batch_context import BatchContext - from src.db.database import Database +from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger -import tempfile -import os.path as path -import csv -logger = get_logger('V実消化用施設データ作成処理') - -sql_err_msg = "SQL実行エラーです。" +logger = get_logger('DCF_DSFデータ作成処理') def exec(): - vjsk_csv_file_name = 'ComInst.csv' + csv_file_name = 'ult_dcf_dsf.csv' # バッチ共通設定を取得 batch_context = BatchContext.get_instance() - if not batch_context.is_ultmarc_imported: - logger.info('アルトマーク取込が行われていないため、V実消化用施設データ作成処理をスキップします。') - return - db = Database.get_instance() try: logger.info('処理開始') - - try: - # DB接続 - db.connect() - except Exception as e: - logger.info('DB接続エラーです。') - raise e - + # DB接続 + db.connect() # CSVファイルの作成用のSQL実行(施設) - record_inst = select_inst_record(db) + record_dcf = select_dcf_record(db) # CSVファイルの作成用のSQL実行(薬局) - record_pharm = select_pharm_record(db) + record_dsf = select_dsf_record(db) # CSVファイル作成 - csv_file_path = make_csv_data(record_inst, record_pharm, vjsk_csv_file_name) + csv_file_path = make_csv_data(record_dcf, record_dsf, csv_file_name) - vjsk_bucket = VjskSendBucket() - try: - # s3へデータ移動 - vjsk_bucket.upload_inst_pharm_csv_file(vjsk_csv_file_name, csv_file_path) - except Exception as e: - logger.info('S3バケットにCSVデータを作成できませんでした。') - raise e + # s3へアップロード + jsk_bucket = VjskSendBucket() + jsk_bucket.upload_dcf_dsf_csv_file(csv_file_name, csv_file_path) - try: - # 処理後ファイルをバックアップ - vjsk_bucket.backup_inst_pharm_csv_file(vjsk_csv_file_name, batch_context.syor_date) - except Exception as e: - logger.info('バックアップバケットへCSVデータをコピーできませんでした。') - raise e + # 連携ファイルをバックアップ + jsk_bucket.backup_inst_pharm_csv_file(csv_file_name, batch_context.syor_date) - csv_count = len(record_inst) + len(record_pharm) + csv_count = len(record_dcf) + len(record_dsf) logger.info(f'CSV出力件数: {csv_count}') logger.info('正常終了') except Exception as e: - raise e + raise BatchOperationException(e) finally: db.disconnect() return -def select_inst_record(db): - # CSVファイル作成用のSQL実行(施設) - try: - # 施設テーブル検索SQL - sql = """\ - SELECT dcf_dsf_inst_cd, - inst_div_cd, - addr_unknown_reason_cd, - form_inst_name_kana, - inst_name_kana, - form_inst_name_kanji, - inst_name_kanji, - rltd_univ_prnt_cd, - bed_num, - close_flg, - estab_sche_flg, - close_start_ym, - estab_sche_ym, - ward_abolish_flg, - inst_repre_cd, - inst_repre_kana, - inst_repre, - phone_number_non_flg, - unconf_flg, - inst_phone_number, - inst_addr_kana, - inst_addr, - postal_number, - village_cd, - prefc_cd, - city_cd, - addr_display_number, - addr_cnt_kana, - addr_cnt, - manage_cd, - delete_sche_reason_cd, - hp_assrt_cd, - dup_opp_cd, - insp_item_micrb, - insp_item_serum, - insp_item_blood, - insp_item_patho, - insp_item_paras, - insp_item_biochem, - insp_item_ri, - re_exam_cd, - prmit_bed_num_other, - prmit_bed_num_mental, - prmit_bed_num_tuber, - prmit_bed_num_infection, - prmit_bed_num_sum, - prmit_bed_num_gen, - prmit_bed_num_rcup, - prmit_bed_maint_ymd, - inst_pharm_div, - abolish_ymd, - delete_flg, - filler_1, - filler_2, - filler_3, - filler_4, - filler_5, - regist_date, - create_user, - update_date, - update_user, - sys_regist_date, - regist_prgm_id, - sys_update_date, - update_prgm_id - FROM src05.com_inst ORDER BY dcf_dsf_inst_cd - """ - return db.execute_select(sql) - except Exception as e: - logger.debug(sql_err_msg) - raise e +def select_dcf_record(db): + # CSVファイル作成用のSQL実行(DCF施設) + sql = """\ + SELECT dcf_dsf_inst_cd, + inst_div_cd, + addr_unknown_reason_cd, + form_inst_name_kana, + inst_name_kana, + form_inst_name_kanji, + inst_name_kanji, + rltd_univ_prnt_cd, + bed_num, + close_flg, + estab_sche_flg, + close_start_ym, + estab_sche_ym, + ward_abolish_flg, + inst_repre_cd, + inst_repre_kana, + inst_repre, + phone_number_non_flg, + unconf_flg, + inst_phone_number, + inst_addr_kana, + inst_addr, + postal_number, + village_cd, + prefc_cd, + city_cd, + addr_display_number, + addr_cnt_kana, + addr_cnt, + manage_cd, + delete_sche_reason_cd, + hp_assrt_cd, + dup_opp_cd, + insp_item_micrb, + insp_item_serum, + insp_item_blood, + insp_item_patho, + insp_item_paras, + insp_item_biochem, + insp_item_ri, + re_exam_cd, + prmit_bed_num_other, + prmit_bed_num_mental, + prmit_bed_num_tuber, + prmit_bed_num_infection, + prmit_bed_num_sum, + prmit_bed_num_gen, + prmit_bed_num_rcup, + prmit_bed_maint_ymd, + inst_pharm_div, + abolish_ymd, + delete_flg, + filler_1, + filler_2, + filler_3, + filler_4, + filler_5, + regist_date, + create_user, + update_date, + update_user, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + FROM src05.com_inst ORDER BY dcf_dsf_inst_cd + """ + return db.execute_select(sql) -def select_pharm_record(db): - # CSVファイル作成用のSQL実行(薬局) - try: - # 薬局テーブル検索SQL - sql = """\ - SELECT dcf_dsf_inst_cd, - inst_div_cd, - addr_unknown_reason_cd, - form_inst_name_kana, - inst_name_kana, - form_inst_name_kanji, - inst_name_kanji, - '' AS rltd_univ_prnt_cd, - '' AS bed_num, - close_flg, - estab_sche_flg, - close_start_ym, - estab_sche_ym, - '' AS ward_abolish_flg, - '' AS inst_repre_cd, - inst_repre_kana, - inst_repre, - phone_number_non_flg, - unconf_flg, - inst_phone_number, - inst_addr_kana, - inst_addr, - postal_number, - village_cd, - prefc_cd, - city_cd, - addr_display_number, - addr_cnt_kana, - addr_cnt, - manage_cd, - delete_sche_reason_cd, - '' AS hp_assrt_cd, - dup_opp_cd, - '' AS insp_item_micrb, - '' AS insp_item_serum, - '' AS insp_item_blood, - '' AS insp_item_patho, - '' AS insp_item_paras, - '' AS insp_item_biochem, - '' AS insp_item_ri, - '' AS re_exam_cd, - '' AS prmit_bed_num_other, - '' AS prmit_bed_num_mental, - '' AS prmit_bed_num_tuber, - '' AS prmit_bed_num_infection, - '' AS prmit_bed_num_sum, - '' AS prmit_bed_num_gen, - '' AS prmit_bed_num_rcup, - '' AS prmit_bed_maint_ymd, - inst_pharm_div, - abolish_ymd, - delete_flg, - filler_1, - filler_2, - filler_3, - filler_4, - filler_5, - regist_date, - create_user, - update_date, - update_user, - sys_regist_date, - regist_prgm_id, - sys_update_date, - update_prgm_id - FROM src05.com_pharm ORDER BY dcf_dsf_inst_cd - """ - return db.execute_select(sql) - except Exception as e: - logger.debug(sql_err_msg) - raise e +def select_dsf_record(db): + # CSVファイル作成用のSQL実行(DSF薬局) + sql = """\ + SELECT dcf_dsf_inst_cd, + inst_div_cd, + addr_unknown_reason_cd, + form_inst_name_kana, + inst_name_kana, + form_inst_name_kanji, + inst_name_kanji, + '' AS rltd_univ_prnt_cd, + '' AS bed_num, + close_flg, + estab_sche_flg, + close_start_ym, + estab_sche_ym, + '' AS ward_abolish_flg, + '' AS inst_repre_cd, + inst_repre_kana, + inst_repre, + phone_number_non_flg, + unconf_flg, + inst_phone_number, + inst_addr_kana, + inst_addr, + postal_number, + village_cd, + prefc_cd, + city_cd, + addr_display_number, + addr_cnt_kana, + addr_cnt, + manage_cd, + delete_sche_reason_cd, + '' AS hp_assrt_cd, + dup_opp_cd, + '' AS insp_item_micrb, + '' AS insp_item_serum, + '' AS insp_item_blood, + '' AS insp_item_patho, + '' AS insp_item_paras, + '' AS insp_item_biochem, + '' AS insp_item_ri, + '' AS re_exam_cd, + '' AS prmit_bed_num_other, + '' AS prmit_bed_num_mental, + '' AS prmit_bed_num_tuber, + '' AS prmit_bed_num_infection, + '' AS prmit_bed_num_sum, + '' AS prmit_bed_num_gen, + '' AS prmit_bed_num_rcup, + '' AS prmit_bed_maint_ymd, + inst_pharm_div, + abolish_ymd, + delete_flg, + filler_1, + filler_2, + filler_3, + filler_4, + filler_5, + regist_date, + create_user, + update_date, + update_user, + sys_regist_date, + regist_prgm_id, + sys_update_date, + update_prgm_id + FROM src05.com_pharm ORDER BY dcf_dsf_inst_cd + """ + return db.execute_select(sql) -def make_csv_data(record_inst: list, record_pharm: list, vjsk_csv_file_name: str): - # 一時ファイルとして保存する(CSVファイル) - try: +def make_csv_data(record_inst: list, record_pharm: list, csv_file_name: str): + # CSVファイルを作成する + temporary_dir = tempfile.mkdtemp() + csv_file_path = path.join(temporary_dir, csv_file_name) - temporary_dir = tempfile.mkdtemp() - csv_file_path = path.join(temporary_dir, vjsk_csv_file_name) + head_str = ['DCF_DSF_INST_CD', 'INST_DIV_CD', 'ADDR_UNKNOWN_REASON_CD', 'FORM_INST_NAME_KANA', 'INST_NAME_KANA', + 'FORM_INST_NAME_KANJI', 'INST_NAME_KANJI', 'RLTD_UNIV_PRNT_CD', 'BED_NUM', 'CLOSE_FLG', 'ESTAB_SCHE_FLG', + 'CLOSE_START_YM', 'ESTAB_SCHE_YM', 'WARD_ABOLISH_FLG', 'INST_REPRE_CD', 'INST_REPRE_KANA', 'INST_REPRE', + 'PHONE_NUMBER_NON_FLG', 'UNCONF_FLG', 'INST_PHONE_NUMBER', 'INST_ADDR_KANA', 'INST_ADDR', 'POSTAL_NUMBER', + 'VILLAGE_CD', 'PREFC_CD', 'CITY_CD', 'ADDR_DISPLAY_NUMBER', 'ADDR_CNT_KANA', 'ADDR_CNT', 'MANAGE_CD', + 'DELETE_SCHE_REASON_CD', 'HP_ASSRT_CD', 'DUP_OPP_CD', 'INSP_ITEM_MICRB', 'INSP_ITEM_SERUM', 'INSP_ITEM_BLOOD', + 'INSP_ITEM_PATHO', 'INSP_ITEM_PARAS', 'INSP_ITEM_BIOCHEM', 'INSP_ITEM_RI', 'RE_EXAM_CD', 'PRMIT_BED_NUM_OTHER', + 'PRMIT_BED_NUM_MENTAL', 'PRMIT_BED_NUM_TUBER', 'PRMIT_BED_NUM_INFECTION', 'PRMIT_BED_NUM_SUM', 'PRMIT_BED_NUM_GEN', + 'PRMIT_BED_NUM_RCUP', 'PRMIT_BED_MAINT_YMD', 'INST_PHARM_DIV', 'ABOLISH_YMD', 'DELETE_FLG', 'FILLER_1', 'FILLER_2', + 'FILLER_3', 'FILLER_4', 'FILLER_5', 'REGIST_DATE', 'CREATE_USER', 'UPDATE_DATE', 'UPDATE_USER', 'SYS_REGIST_DATE', + 'REGIST_PRGM_ID', 'SYS_UPDATE_DATE', 'UPDATE_PRGM_ID'] - head_str = ['DCF_DSF_INST_CD', 'INST_DIV_CD', 'ADDR_UNKNOWN_REASON_CD', 'FORM_INST_NAME_KANA', 'INST_NAME_KANA', - 'FORM_INST_NAME_KANJI', 'INST_NAME_KANJI', 'RLTD_UNIV_PRNT_CD', 'BED_NUM', 'CLOSE_FLG', 'ESTAB_SCHE_FLG', - 'CLOSE_START_YM', 'ESTAB_SCHE_YM', 'WARD_ABOLISH_FLG', 'INST_REPRE_CD', 'INST_REPRE_KANA', 'INST_REPRE', - 'PHONE_NUMBER_NON_FLG', 'UNCONF_FLG', 'INST_PHONE_NUMBER', 'INST_ADDR_KANA', 'INST_ADDR', 'POSTAL_NUMBER', - 'VILLAGE_CD', 'PREFC_CD', 'CITY_CD', 'ADDR_DISPLAY_NUMBER', 'ADDR_CNT_KANA', 'ADDR_CNT', 'MANAGE_CD', - 'DELETE_SCHE_REASON_CD', 'HP_ASSRT_CD', 'DUP_OPP_CD', 'INSP_ITEM_MICRB', 'INSP_ITEM_SERUM', 'INSP_ITEM_BLOOD', - 'INSP_ITEM_PATHO', 'INSP_ITEM_PARAS', 'INSP_ITEM_BIOCHEM', 'INSP_ITEM_RI', 'RE_EXAM_CD', 'PRMIT_BED_NUM_OTHER', - 'PRMIT_BED_NUM_MENTAL', 'PRMIT_BED_NUM_TUBER', 'PRMIT_BED_NUM_INFECTION', 'PRMIT_BED_NUM_SUM', 'PRMIT_BED_NUM_GEN', - 'PRMIT_BED_NUM_RCUP', 'PRMIT_BED_MAINT_YMD', 'INST_PHARM_DIV', 'ABOLISH_YMD', 'DELETE_FLG', 'FILLER_1', 'FILLER_2', - 'FILLER_3', 'FILLER_4', 'FILLER_5', 'REGIST_DATE', 'CREATE_USER', 'UPDATE_DATE', 'UPDATE_USER', 'SYS_REGIST_DATE', - 'REGIST_PRGM_ID', 'SYS_UPDATE_DATE', 'UPDATE_PRGM_ID'] + with open(csv_file_path, mode='w', encoding='UTF-8') as csv_file: + # ヘッダ行書き込み（くくり文字をつけない為にwriterowではなく、writeを使用しています） + csv_file.write(f"{','.join(head_str)}\n") - with open(csv_file_path, mode='w', encoding='UTF-8') as csv_file: - # ヘッダ行書き込み（くくり文字をつけない為にwriterowではなく、writeを使用しています） - csv_file.write(f"{','.join(head_str)}\n") + # Shift-JIS、CRLF、価囲いありで書き込む + writer = csv.writer(csv_file, delimiter=',', lineterminator='\n', + quotechar='"', doublequote=True, quoting=csv.QUOTE_ALL, + strict=True + ) - # Shift-JIS、CRLF、価囲いありで書き込む - writer = csv.writer(csv_file, delimiter=',', lineterminator='\n', - quotechar='"', doublequote=True, quoting=csv.QUOTE_ALL, - strict=True - ) + # データ部分書き込み(施設) + for record_inst_data in record_inst: + record_inst_value = list(record_inst_data.values()) + csv_data = ['' if n is None else n for n in record_inst_value] + writer.writerow(csv_data) - # データ部分書き込み(施設) - for record_inst_data in record_inst: - record_inst_value = list(record_inst_data.values()) - csv_data = ['' if n is None else n for n in record_inst_value] - writer.writerow(csv_data) - - # データ部分書き込み(薬局) - for record_pharm_data in record_pharm: - record_pharm_value = list(record_pharm_data.values()) - csv_data = ['' if n is None else n for n in record_pharm_value] - writer.writerow(csv_data) - - except Exception as e: - logger.info('CSVデータの作成に失敗しました。') - raise e + # データ部分書き込み(薬局) + for record_pharm_data in record_pharm: + record_pharm_value = list(record_pharm_data.values()) + csv_data = ['' if n is None else n for n in record_pharm_value] + writer.writerow(csv_data) return csv_file_path diff --git a/ecs/jskult-batch-ultmarc-io/src/db/database.py b/ecs/jskult-batch-ultmarc-io/src/db/database.py index 5ddaba4e..02904db0 100644 --- a/ecs/jskult-batch-ultmarc-io/src/db/database.py +++ b/ecs/jskult-batch-ultmarc-io/src/db/database.py @@ -181,7 +181,7 @@ class Database: self.__connection = None def to_jst(self): - self.execute('SET time_zone = "+9:00"') + self.execute('SET time_zone = "+9:00"') def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する diff --git a/ecs/jskult-batch-ultmarc-io/src/main.py b/ecs/jskult-batch-ultmarc-io/src/main.py index 04be35fb..346cb79e 100644 --- a/ecs/jskult-batch-ultmarc-io/src/main.py +++ b/ecs/jskult-batch-ultmarc-io/src/main.py @@ -1,11 +1,10 @@ """実消化&アルトマーク アルトマーク取込/データ出力処理""" -from src.batch.batch_functions import ( - get_batch_statuses, update_batch_processing_flag_in_processing) from src.batch.common.batch_context import BatchContext from src.batch.ultmarc import import_ultmarc_process, output_dcf_dsf_data from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger +from src.manager.jskult_hdke_tbl_manager import JskultHdkeTblManager from src.system_var import constants logger = get_logger('アルトマーク取込/データ出力') @@ -17,34 +16,16 @@ batch_context = BatchContext.get_instance() def exec(): try: logger.info('アルトマーク取込/データ出力：開始') - try: - # 日次バッチ処置中フラグ、dump処理状態区分、処理日を取得 - batch_processing_flag, dump_status_kbn, syor_date = 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_IN_PROCESSING: - logger.error('日次バッチ処理中のため、日次バッチ処理を終了します。') - return constants.BATCH_EXIT_CODE_SUCCESS - - # dump取得が正常終了していない場合、後続の処理は行わない - if dump_status_kbn != constants.DUMP_STATUS_KBN_COMPLETE: - logger.error('dump取得が正常終了していないため、日次バッチ処理を終了します。') + hdke_tbl_manager = JskultHdkeTblManager() + 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() logger.info(f'処理日＝{syor_date}') # バッチ共通設定に処理日を追加 batch_context.syor_date = syor_date - # バッチ処理中に更新 - try: - update_batch_processing_flag_in_processing() - except BatchOperationException as e: - logger.exception(f'処理フラグ更新(未処理→処理中) エラー（異常終了）{e}') - return constants.BATCH_EXIT_CODE_SUCCESS - try: logger.info('アルトマーク取込：起動') import_ultmarc_process.exec_import() @@ -53,9 +34,6 @@ def exec(): logger.exception(f'アルトマーク取込処理エラー（異常終了）{e}') return constants.BATCH_EXIT_CODE_SUCCESS - # 調査目的でアルトマーク取込が行われたかどうかをログ出力 - logger.debug(f'{"アルトマーク取込が行われました。" if batch_context.is_ultmarc_imported else "アルトマーク取込が行われませんでした。"}') - try: logger.info('V実消化用施設データ作成処理：起動') output_dcf_dsf_data.exec() diff --git a/ecs/jskult-batch-ultmarc-io/src/manager/jskult_hdke_tbl_manager.py b/ecs/jskult-batch-ultmarc-io/src/manager/jskult_hdke_tbl_manager.py new file mode 100644 index 00000000..aecf3965 --- /dev/null +++ b/ecs/jskult-batch-ultmarc-io/src/manager/jskult_hdke_tbl_manager.py @@ -0,0 +1,122 @@ +from datetime import datetime + +from src.db.database import Database +from src.error.exceptions import BatchOperationException, DBException +from src.system_var import constants + + +class JskultHdkeTblManager: + _db: Database + + def __init__(self): + self._db = Database.get_instance() + + def get_batch_statuses(self) -> tuple[str, str, str]: + """日次バッチ処理中フラグ、dump取得状況区分、処理日を取得する + + Raises: + BatchOperationException: DB操作の何らかのエラー + + Returns: + tuple[str, str, str]: [0]日次バッチ処理中フラグ、[1]dump取得状況区分、[2]処理日 + """ + sql = 'SELECT bch_actf, dump_sts_kbn, src07.get_syor_date() AS syor_date FROM src07.hdke_tbl' + try: + self._db.connect() + hdke_tbl_result = self._db.execute_select(sql) + except DBException as e: + raise BatchOperationException(e) + finally: + self._db.disconnect() + + if len(hdke_tbl_result) == 0: + raise BatchOperationException('日付テーブルが取得できませんでした') + + # 必ず1件取れる + hdke_tbl_record = hdke_tbl_result[0] + batch_processing_flag = hdke_tbl_record['bch_actf'] + dump_status_kbn = hdke_tbl_record['dump_sts_kbn'] + syor_date = hdke_tbl_record['syor_date'] + # 処理日を文字列に変換する + syor_date_str = datetime.strftime(syor_date, '%Y/%m/%d') + + return batch_processing_flag, dump_status_kbn, syor_date_str + + def update_batch_process_start(self): + """バッチ処理中フラグを処理中に更新する + + Raises: + BatchOperationException: DB操作の何らかのエラー + """ + + sql = """\ + UPDATE src07.hdke_tbl + SET + bch_actf = :start, + updater = CURRENT_USER(), + update_date = NOW() + """ + try: + self._db.connect() + self._db.to_jst() + self._db.execute( + sql, {'start': constants.BATCH_ACTF_BATCH_START}) + except DBException as e: + raise BatchOperationException(e) + finally: + self._db.disconnect() + + return + + def update_batch_process_complete(self) -> None: + """バッチ正常終了処理時の更新処理 + + Raises: + BatchOperationException: DB操作の何らかのエラー + """ + + sql = """\ + UPDATE src07.hdke_tbl + SET + bch_actf = :batch_complete, + dump_sts_kbn = :dump_unprocessed, + syor_date = DATE_FORMAT((src07.get_syor_date() + interval 1 day), '%Y%m%d'), -- +1日 + updater = CURRENT_USER(), + update_date = NOW() + """ + try: + self._db.connect() + self._db.to_jst() + self._db.execute(sql, { + 'batch_complete': constants.BATCH_ACTF_BATCH_UNPROCESSED, + 'dump_unprocessed': constants.DUMP_STATUS_KBN_UNPROCESSED + }) + except DBException as e: + raise BatchOperationException(e) + finally: + self._db.disconnect() + + def can_run_process(self) -> bool: + """バッチ処理を起動してよいかを判定する + + Raises: + BatchOperationException: DB操作の何らかのエラー + + Returns: + bool: バッチ処理を実行して良い場合はTrue + """ + try: + # 日次バッチ処置中フラグ、dump処理状態区分を取得 + batch_processing_flag, dump_status_kbn, _ = self.get_batch_statuses() + except DBException as e: + raise BatchOperationException(e) + finally: + self._db.disconnect() + # 日次バッチ処理中の場合、後続の処理は行わない + if batch_processing_flag == constants.BATCH_ACTF_BATCH_START: + return False + # dump取得が正常終了していない場合、後続の処理は行わない + if dump_status_kbn != constants.DUMP_STATUS_KBN_COMPLETE: + return False + + return True