diff --git a/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py b/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py new file mode 100644 index 00000000..bfd359a1 --- /dev/null +++ b/ecs/jskult-batch-daily/src/batch/datachange/res_mak_inst_lau.py @@ -0,0 +1,20 @@ +from src.db.database import Database +from src.error.exceptions import BatchOperationException +from src.logging.get_logger import get_logger + +logger = get_logger('実績洗替') + + +def batch_process(): + db = Database.get_instance() + try: + db.connect() + except Exception as e: + logger.info("実績洗替 データベース接続に失敗") + raise BatchOperationException(e) + + logger.info('実績洗替 開始') + db.execute('CALL src05.v_inst_merge_t_create()') + db.execute('CALL src05.inst_merge_t_create()') + db.disconnect() + logger.info('実績洗替 終了') diff --git a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py b/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py index 7f5d9fcf..93895f77 100644 --- a/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py +++ b/ecs/jskult-batch-daily/src/batch/jissekiaraigae.py @@ -1,11 +1,14 @@ -from src.batch.datachange import emp_chg_inst_lau -from src.logging.get_logger import get_logger - -logger = get_logger('実績洗替') - - -def batch_process(): - """実績洗替処理""" - logger.info('Start Jisseki Araigae Batch PGM.') - # 施設担当者洗替 - emp_chg_inst_lau.batch_process() +from src.batch.datachange import emp_chg_inst_lau +from src.batch.datachange import res_mak_inst_lau +from src.logging.get_logger import get_logger + +logger = get_logger('実績洗替') + + +def batch_process(): + """実績洗替処理""" + logger.info('Start Jisseki Araigae Batch PGM.') + # 洗替用マスタ作成 + res_mak_inst_lau.batch_process() + # 施設担当者洗替 + emp_chg_inst_lau.batch_process() diff --git a/ecs/jskult-batch-daily/src/db/database.py b/ecs/jskult-batch-daily/src/db/database.py index 7e8f845c..0317bc21 100644 --- a/ecs/jskult-batch-daily/src/db/database.py +++ b/ecs/jskult-batch-daily/src/db/database.py @@ -83,7 +83,10 @@ class Database: Raises: DBException: 接続失敗 """ - self.__connection = self.__engine.connect() + try: + self.__connection = self.__engine.connect() + except Exception as e: + raise DBException(e) def execute_select(self, select_query: str, parameters=None) -> list[dict]: """SELECTクエリを実行します。