From 7ce58fac4fc5978fec69b4f3650d6ae85369e739 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Fri, 14 Apr 2023 13:15:55 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80?= =?UTF-8?q?=E6=A7=8B=E6=88=90=E3=80=81=E9=96=A2=E6=95=B0=E5=90=8D=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/jskult-batch-daily/entrypoint.py | 4 ++-- .../src/batch/{datachange => laundering}/__init__.py | 0 .../emp_chg_inst_laundering.py} | 2 +- .../{jissekiaraigae.py => laundering/sales_laundering.py} | 6 +++--- ecs/jskult-batch-daily/src/jobctrl_daily.py | 8 +++++--- 5 files changed, 11 insertions(+), 9 deletions(-) rename ecs/jskult-batch-daily/src/batch/{datachange => laundering}/__init__.py (100%) rename ecs/jskult-batch-daily/src/batch/{datachange/emp_chg_inst_lau.py => laundering/emp_chg_inst_laundering.py} (99%) rename ecs/jskult-batch-daily/src/batch/{jissekiaraigae.py => laundering/sales_laundering.py} (64%) diff --git a/ecs/jskult-batch-daily/entrypoint.py b/ecs/jskult-batch-daily/entrypoint.py index 43a997dc..472efd9f 100644 --- a/ecs/jskult-batch-daily/entrypoint.py +++ b/ecs/jskult-batch-daily/entrypoint.py @@ -1,9 +1,9 @@ """実消化&アルトマーク 日次バッチのエントリーポイント""" -from src.jobctrl_daily import batch_process +from src import jobctrl_daily if __name__ == '__main__': try: - exit(batch_process()) + exit(jobctrl_daily.exec()) except Exception: # エラーが起きても、正常系のコードで返す。 # エラーが起きた事実はbatch_process内でログを出す。 diff --git a/ecs/jskult-batch-daily/src/batch/datachange/__init__.py b/ecs/jskult-batch-daily/src/batch/laundering/__init__.py similarity index 100% rename from ecs/jskult-batch-daily/src/batch/datachange/__init__.py rename to ecs/jskult-batch-daily/src/batch/laundering/__init__.py diff --git a/ecs/jskult-batch-daily/src/batch/datachange/emp_chg_inst_lau.py b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py similarity index 99% rename from ecs/jskult-batch-daily/src/batch/datachange/emp_chg_inst_lau.py rename to ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py index 64a6a363..c8a28baf 100644 --- a/ecs/jskult-batch-daily/src/batch/datachange/emp_chg_inst_lau.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/emp_chg_inst_laundering.py @@ -9,7 +9,7 @@ logger = get_logger('48-施設担当者マスタ洗替') batch_config = BatchConfig.get_instance() -def batch_process(): +def exec(): db = Database.get_instance() db.connect() logger.info('##########################') diff --git a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py b/ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py similarity index 64% rename from ecs/jskult-batch-daily/src/batch/jissekiaraigae.py rename to ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py index 7f5d9fcf..c1884b7d 100644 --- a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/sales_laundering.py @@ -1,11 +1,11 @@ -from src.batch.datachange import emp_chg_inst_lau +from src.batch.laundering import emp_chg_inst_laundering from src.logging.get_logger import get_logger logger = get_logger('実績洗替') -def batch_process(): +def exec(): """実績洗替処理""" logger.info('Start Jisseki Araigae Batch PGM.') # 施設担当者洗替 - emp_chg_inst_lau.batch_process() + emp_chg_inst_laundering.exec() diff --git a/ecs/jskult-batch-daily/src/jobctrl_daily.py b/ecs/jskult-batch-daily/src/jobctrl_daily.py index 385586f4..c56fe8ba 100644 --- a/ecs/jskult-batch-daily/src/jobctrl_daily.py +++ b/ecs/jskult-batch-daily/src/jobctrl_daily.py @@ -1,8 +1,10 @@ -from src.batch import jissekiaraigae +"""実消化&アルトマーク 日次バッチ処理""" + from src.batch.batch_functions import ( get_batch_statuses, update_batch_process_complete, update_batch_processing_flag_in_processing) from src.batch.common.batch_config import BatchConfig +from src.batch.laundering import sales_laundering from src.batch.ultmarc import ultmarc_process from src.error.exceptions import BatchOperationException from src.logging.get_logger import get_logger @@ -14,7 +16,7 @@ logger = get_logger('日次処理コントロール') batch_config = BatchConfig.get_instance() -def batch_process(): +def exec(): try: logger.info('日次ジョブ：開始') try: @@ -123,7 +125,7 @@ def batch_process(): try: # ここで、生物由来ロット分解と並行処理 logger.info('実績更新：起動') - jissekiaraigae.batch_process() + sales_laundering.exec() logger.info('生物由来ロット分解：起動') logger.info('実績更新：終了') logger.info('生物由来ロット分解：終了')