diff --git a/ecs/jskult-batch-daily/src/batch/batch_functions.py b/ecs/jskult-batch-daily/src/batch/batch_functions.py index 87a7793d..43c4760c 100644 --- a/ecs/jskult-batch-daily/src/batch/batch_functions.py +++ b/ecs/jskult-batch-daily/src/batch/batch_functions.py @@ -60,6 +60,7 @@ def update_batch_processing_flag_in_processing() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) except DBException as e: raise BatchOperationException(e) @@ -87,6 +88,7 @@ def update_batch_process_complete() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, { 'batch_complete': constants.BATCH_ACTF_BATCH_UNPROCESSED, 'dump_unprocessed': constants.DUMP_STATUS_KBN_UNPROCESSED diff --git a/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py b/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py index b7434967..9776eb8d 100644 --- a/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py +++ b/ecs/jskult-batch-daily/src/batch/laundering/ult_ident_presc_laundering.py @@ -13,6 +13,7 @@ def exec(): db = Database.get_instance() try: db.connect() + db.to_jst() logger.debug('納入先処方元マスタの洗替処理開始') # ult_ident_presc_lauをTruncate _truncate_ult_ident_presc_lau(db) diff --git a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py index 6006c030..b693bd07 100644 --- a/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py +++ b/ecs/jskult-batch-daily/src/batch/vjsk/vjsk_data_load_manager.py @@ -37,6 +37,7 @@ class VjskDataLoadManager: try: # データベース接続 db.connect() + db.to_jst() db.execute("SET SESSION sql_mode = 'TRADITIONAL';") # orgをtruncate diff --git a/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py b/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py index d3f81597..1b375d3f 100644 --- a/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py +++ b/ecs/jskult-batch-monthly/src/batch/output_arisj_file_process.py @@ -30,6 +30,8 @@ def exec(): except Exception as e: logger.info('DB接続エラーです') raise e + # タイムゾーンをJSTに変更 + db.to_jst() # トランザクションの開始 db.begin() diff --git a/ecs/jskult-batch-monthly/src/db/database.py b/ecs/jskult-batch-monthly/src/db/database.py index d2171fb5..aa350012 100644 --- a/ecs/jskult-batch-monthly/src/db/database.py +++ b/ecs/jskult-batch-monthly/src/db/database.py @@ -167,6 +167,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin(): diff --git a/ecs/jskult-dbdump/src/batch/batch_functions.py b/ecs/jskult-dbdump/src/batch/batch_functions.py index e51f336b..eece0536 100644 --- a/ecs/jskult-dbdump/src/batch/batch_functions.py +++ b/ecs/jskult-dbdump/src/batch/batch_functions.py @@ -55,6 +55,7 @@ def update_dump_status_kbn_in_processing() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, {'in_processing': constants.BATCH_ACTF_BATCH_IN_PROCESSING}) except DBException as e: raise BatchOperationException(e) @@ -80,6 +81,7 @@ def update_dump_status_kbn_error() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, { 'dump_unprocessed': constants.DUMP_STATUS_KBN_ERROR }) @@ -107,6 +109,7 @@ def update_dump_status_kbn_complete() -> None: """ try: db.connect() + db.to_jst() db.execute(sql, { 'dump_unprocessed': constants.DUMP_STATUS_KBN_COMPLETE }) diff --git a/ecs/jskult-dbdump/src/db/database.py b/ecs/jskult-dbdump/src/db/database.py index b675381c..24bb6061 100644 --- a/ecs/jskult-dbdump/src/db/database.py +++ b/ecs/jskult-dbdump/src/db/database.py @@ -165,6 +165,9 @@ class Database: self.__connection.close() self.__connection = None + def to_jst(self): + self.execute('SET time_zone = "+9:00"') + def __execute_with_transaction(self, query: str, parameters: dict): # トランザクションを開始してクエリを実行する with self.__connection.begin():