From 1cede4be06b926df9fc920c6d8ebb3baec47fdf5 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Thu, 5 Jun 2025 17:24:17 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E3=83=AD=E3=82=B0=E3=81=8C=E5=87=BA?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=81=A8=E5=AE=9A=E6=95=B0=E3=81=AE=E7=BD=AE=E3=81=8D?= =?UTF-8?q?=E6=8F=9B=E3=81=88=E3=81=A8=E3=83=90=E3=82=B0=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index c5b99021..33e47faa 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -44,6 +44,8 @@ class MstInstAll(JskultBatchEntrypoint): '日次バッチ処理中またはdump取得が正常終了していないため、メルク施設マスタ作成処理を終了します。') # バッチ実行管理テーブルをfailedで登録 jskult_batch_run_manager.batch_failed() + jskult_batch_status_manager.set_process_status( + constants.PROCESS_STATUS_ERROR) return # 業務日付を取得 @@ -58,6 +60,9 @@ class MstInstAll(JskultBatchEntrypoint): logger.exception(f'転送ファイル一覧の取得に失敗しました。 {e}') # バッチ実行管理テーブルをfailedで登録 jskult_batch_run_manager.batch_failed() + jskult_batch_status_manager.set_process_status( + constants.PROCESS_STATUS_ERROR) + return with open(transfer_list_file_path) as f: transfer_list = json.load(f) @@ -68,8 +73,7 @@ class MstInstAll(JskultBatchEntrypoint): jskult_batch_status_manager = JskultBatchStatusManager( environment.PROCESS_NAME, - # TODO チケットNEWDWH2021-1847の実装で作成した定数に置き換え - 'post_process', + constants.PROCESS_TYPE_POST_PROCESS, environment.MAX_RUN_COUNT, receive_file_count ) @@ -86,6 +90,7 @@ class MstInstAll(JskultBatchEntrypoint): # バッチ実行管理テーブルに「retry」で登録 jskult_batch_run_manager.batch_retry() + logger.info('起動条件を満たしていないため、メルク施設マスタ作成処理を終了します') return except MaxRunCountReachedException: @@ -284,7 +289,7 @@ class MstInstAll(JskultBatchEntrypoint): return - def _insert_mst_inst_all_from_mst_inst_merck(self, db:Database): + def _insert_mst_inst_all_from_mst_inst_merck(self, db: Database): # mst_inst_merckから、mst_inst_allへInsert try: sql = """ @@ -338,10 +343,10 @@ class MstInstAll(JskultBatchEntrypoint): null, null, null, - mim.ins_user, - mim.ins_date, - mim.upd_user, - mim.upd_date + mim.create_id, + mim.create_dtt, + mim.last_upd_id, + mim.last_upd_dtt FROM src07.mst_inst_merck AS mim INNER JOIN ( @@ -364,4 +369,4 @@ class MstInstAll(JskultBatchEntrypoint): logger.info("メルク独自施設マスタからメルク施設マスタに登録失敗") raise e - return \ No newline at end of file + return From 2ad67967fa7dd209cfd0bbe6f944d5a78a80f32b Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Fri, 6 Jun 2025 09:02:25 +0900 Subject: [PATCH 2/7] =?UTF-8?q?derived=5Fmerge=E3=83=95=E3=83=A9=E3=82=B0?= =?UTF-8?q?=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B=E9=83=A8=E5=88=86=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index 33e47faa..d6d9642b 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -135,17 +135,6 @@ class MstInstAll(JskultBatchEntrypoint): return def _insert_mst_inst_all_from_com_inst(self, db: Database): - # オプティマイザのderived_mergeフラグをoffにする - try: - sql = """ - SET SESSION optimizer_switch = 'derived_merge=off' - """ - db.execute(sql) - logger.info("オプティマイザのderived_mergeフラグ = Off") - except Exception as e: - logger.info("オプティマイザのderived_mergeフラグの値変更に失敗") - raise e - # com_instから、mst_inst_allへInsert try: sql = """ From fc5de5f81f58ac4c65b35ec55f5a6752bd129736 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Fri, 6 Jun 2025 18:54:22 +0900 Subject: [PATCH 3/7] =?UTF-8?q?SQL=E6=96=87=E3=81=AE=E8=AA=A4=E3=82=8A?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index d6d9642b..aac57921 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -182,10 +182,10 @@ class MstInstAll(JskultBatchEntrypoint): ci.inst_div_cd, LEFT(cid.inst_div_name, 40), null, - ci.create_user, - ci.regist_date, - ci.update_user, - ci.update_date + ci.regist_prgm_id, + ci.sys_regist_date, + ci.update_prgm_id, + ci.sys_update_date FROM src05.com_inst AS ci LEFT OUTER JOIN src05.mst_prefc AS mp @@ -254,10 +254,10 @@ class MstInstAll(JskultBatchEntrypoint): cp.inst_div_cd, LEFT(cid.inst_div_name, 40), null, - cp.create_user, - cp.regist_date, - cp.update_user, - cp.update_date + cp.regist_prgm_id, + cp.sys_regist_date, + cp.update_prgm_id, + cp.sys_update_date FROM src05.com_pharm AS cp LEFT OUTER JOIN src05.mst_prefc AS mp @@ -319,7 +319,7 @@ class MstInstAll(JskultBatchEntrypoint): mim.jis_city_cd, mjp.jis_pref_nm_kj, LEFT(mjc.jis_city_nm_kj, 40), - CONCAT(mim.addr1_nm_kj, mim.addr2_nm_kj), + CONCAT_WS('', mim.addr1_nm_kj, mim.addr2_nm_kj), mim.postal_no, mim.tel_no, null, @@ -327,7 +327,7 @@ class MstInstAll(JskultBatchEntrypoint): null, CASE mim.eff_end_ym WHEN '999912' THEN null - ELSE CONCAT(mim.eff_end_ym, DATE_FORMAT(LAST_DAY(STR_TO_DATE(mim.eff_end_ym, '%Y%m')), '%d')) + ELSE CONCAT(LAST_DAY(STR_TO_DATE(CONCAT(mim.eff_end_ym, '01'), '%Y%m%d'))) END, null, null, From 403ce3827ec8f64c43b91b884f127d037aef57f8 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Mon, 9 Jun 2025 16:30:09 +0900 Subject: [PATCH 4/7] =?UTF-8?q?JskultBatchStatusManager=E3=81=AE=E5=BC=95?= =?UTF-8?q?=E6=95=B0=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index aac57921..8348d97a 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -72,9 +72,9 @@ class MstInstAll(JskultBatchEntrypoint): transfer_list['jsk_transfer_list']) + len(transfer_list['ult_transfer_list']) jskult_batch_status_manager = JskultBatchStatusManager( - environment.PROCESS_NAME, + self.environment.PROCESS_NAME, constants.PROCESS_TYPE_POST_PROCESS, - environment.MAX_RUN_COUNT, + self.environment.MAX_RUN_COUNT, receive_file_count ) try: From 64c81784604ed803733de3087a7005859b7c3305 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 9 Jun 2025 17:59:18 +0900 Subject: [PATCH 5/7] =?UTF-8?q?format:=20=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=81=AEimport=E3=81=A8=E5=A4=89=E6=95=B0=E3=82=92=E5=89=8A?= =?UTF-8?q?=E9=99=A4=E3=80=82=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83?= =?UTF-8?q?=E3=83=88=E9=81=A9=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index 8348d97a..aad86fc4 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -1,9 +1,6 @@ -import csv import json -import os.path as path -import tempfile -from src.aws.s3 import JskSendBucket, JskTransferListBucket +from src.aws.s3 import JskTransferListBucket from src.batch.environment.mst_inst_all_environment import \ MstInstAllEnvironment from src.batch.jskult_batch_entrypoint import JskultBatchEntrypoint @@ -15,7 +12,6 @@ from src.logging.get_logger import get_logger from src.manager.jskult_batch_run_manager import JskultBatchRunManager from src.manager.jskult_batch_status_manager import JskultBatchStatusManager from src.manager.jskult_hdke_tbl_manager import JskultHdkeTblManager -from src.system_var import environment from src.system_var import constants logger = get_logger('メルク施設マスタ作成') @@ -198,7 +194,7 @@ class MstInstAll(JskultBatchEntrypoint): LEFT OUTER JOIN src05.com_inst_div AS cid ON ci.inst_div_cd = cid.inst_div_cd """ - res = db.execute(sql) + db.execute(sql) logger.info("COM_施設からメルク施設マスタに登録成功") except Exception as e: logger.info("COM_施設からメルク施設マスタに登録失敗") @@ -270,7 +266,7 @@ class MstInstAll(JskultBatchEntrypoint): LEFT OUTER JOIN src05.com_inst_div AS cid ON cp.inst_div_cd = cid.inst_div_cd """ - res = db.execute(sql) + db.execute(sql) logger.info("COM_薬局からメルク施設マスタに登録成功") except Exception as e: logger.info("COM_薬局からメルク施設マスタに登録失敗") @@ -343,16 +339,16 @@ class MstInstAll(JskultBatchEntrypoint): FROM src07.mst_inst_merck AS mim GROUP BY mim.inst_cd ) AS mim_max_end_ym - ON mim.inst_cd = mim_max_end_ym.inst_cd + ON mim.inst_cd = mim_max_end_ym.inst_cd AND mim.eff_end_ym = mim_max_end_ym.max_end_ym LEFT OUTER JOIN src07.mst_jis_pref AS mjp ON mim.jis_pref_cd = mjp.jis_pref_cd LEFT OUTER JOIN src07.mst_jis_city AS mjc ON mim.jis_pref_cd = mjc.jis_pref_cd AND mim.jis_city_cd = mjc.jis_city_cd; - + """ - res = db.execute(sql) + db.execute(sql) logger.info("メルク独自施設マスタからメルク施設マスタに登録成功") except Exception as e: logger.info("メルク独自施設マスタからメルク施設マスタに登録失敗") From ec4c8e64638d9072f95e7e703a15408341889e34 Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Tue, 10 Jun 2025 09:20:08 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E6=A7=8B=E6=96=87=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=81=AE=E9=83=A8=E5=88=86=E3=81=AE=E5=89=8A=E9=99=A4?= =?UTF-8?q?=E3=81=A8=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 2 -- s3/config/jskult/task_settings/mst_inst_all_task_settings.env | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index aad86fc4..1605e7c9 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -56,8 +56,6 @@ class MstInstAll(JskultBatchEntrypoint): logger.exception(f'転送ファイル一覧の取得に失敗しました。 {e}') # バッチ実行管理テーブルをfailedで登録 jskult_batch_run_manager.batch_failed() - jskult_batch_status_manager.set_process_status( - constants.PROCESS_STATUS_ERROR) return with open(transfer_list_file_path) as f: diff --git a/s3/config/jskult/task_settings/mst_inst_all_task_settings.env b/s3/config/jskult/task_settings/mst_inst_all_task_settings.env index 85e70ad1..96aad4ac 100644 --- a/s3/config/jskult/task_settings/mst_inst_all_task_settings.env +++ b/s3/config/jskult/task_settings/mst_inst_all_task_settings.env @@ -1,6 +1,6 @@ # task environment file. LOG_LEVEL=INFO -ENTRYPOINT_MODULE_NAME=jskult-batch-mst-inst-all +PROCESS_NAME=jskult-batch-mst-inst-all TRANSFER_RESULT_FOLDER=transfer_result TRANSFER_RESULT_FILE_NAME=transfer_result.json DB_CONNECTION_MAX_RETRY_ATTEMPT=4 From daecbd34646908f5b8959afe1dc4c33c7f73696b Mon Sep 17 00:00:00 2001 From: "mori.k" Date: Tue, 10 Jun 2025 10:56:15 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E6=8C=87=E6=91=98=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=E3=81=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch/src/batch/mst_inst_all.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/ecs/jskult-batch/src/batch/mst_inst_all.py b/ecs/jskult-batch/src/batch/mst_inst_all.py index 1605e7c9..9d1108a7 100644 --- a/ecs/jskult-batch/src/batch/mst_inst_all.py +++ b/ecs/jskult-batch/src/batch/mst_inst_all.py @@ -40,8 +40,6 @@ class MstInstAll(JskultBatchEntrypoint): '日次バッチ処理中またはdump取得が正常終了していないため、メルク施設マスタ作成処理を終了します。') # バッチ実行管理テーブルをfailedで登録 jskult_batch_run_manager.batch_failed() - jskult_batch_status_manager.set_process_status( - constants.PROCESS_STATUS_ERROR) return # 業務日付を取得