From 2885b56c0c61c02554f208f497314c0b567cfda8 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 16 Jun 2025 16:13:13 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=200=E3=83=90=E3=82=A4=E3=83=88?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E6=99=82=E3=81=AB?= =?UTF-8?q?=E6=8B=A1=E5=BC=B5SQL=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=8B=E3=81=A9=E3=81=86=E3=81=8B=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=83=A9=E3=82=B0=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/dataimport/dataimport/chk.py | 71 ++++++++++++++++++++++--- ecs/dataimport/dataimport/common.py | 18 ++++--- ecs/dataimport/dataimport/controller.py | 2 +- ecs/dataimport/dataimport/main.py | 5 +- 4 files changed, 77 insertions(+), 19 deletions(-) diff --git a/ecs/dataimport/dataimport/chk.py b/ecs/dataimport/dataimport/chk.py index de3feca6..207e898b 100644 --- a/ecs/dataimport/dataimport/chk.py +++ b/ecs/dataimport/dataimport/chk.py @@ -5,14 +5,13 @@ import sys from datetime import datetime import boto3 -from common import (ERROR, INFO, LINE_FEED_CODE, SETTINGS_ITEM, - convert_quotechar, debug_log, uncompress_gzip, - uncompress_zip) +import pymysql +from common import (DIRECTORY_SETTINGS, DIRECTORY_WORK, ERROR, INFO, + LINE_FEED_CODE, SETTINGS_ITEM, WARNING, convert_quotechar, + debug_log, uncompress_gzip, uncompress_zip) from end import end from error import error - -# 定数 -DIRECTORY_WORK = '/work/' +from pymysql.constants import CLIENT # クラス変数 s3_client = boto3.client('s3') @@ -23,13 +22,14 @@ class CheckError(Exception): pass -def check(bucket_name, target_data_source, target_file_name, settings_key, log_info, mode): +def check(bucket_name, target_data_source, target_file_name, settings_key, db_info, log_info, mode): """チェック処理 Args: bucket_name : バケット名 target_data_source : 投入データのディレクトリ名よりデータソースに該当する部分 target_file_name : 投入データのファイル名 settings_key : 投入データに該当する個別設定ファイルのフルパス + db_info : データベース情報 log_info : ログに記載するデータソース名とファイル名 mode : 処理モード Raises: @@ -91,6 +91,12 @@ def check(bucket_name, target_data_source, target_file_name, settings_key, log_i print( f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-02 - C-0のチェックを開始します') if is_empty_file(work_csv_row, settings_list): + # 拡張SQL実行フラグがONになっている場合は拡張SQLを実行して処理終了する。 + if settings_list[SETTINGS_ITEM["executeExSqlIfFileEmptyFlag"]] == '1': + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-15 - 投入ファイルが０バイトでしたが、拡張SQLを実行します。') + execute_ex_sql(bucket_name, target_data_source, + settings_list, db_info, log_info) print( f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-03 - 投入ファイルが０バイトのため処理を終了します') end(bucket_name, target_data_source, @@ -260,6 +266,57 @@ def reverse_readline_stream(f: io.BytesIO, line_feed: str, chunk_size=4096): yield buffer +def execute_ex_sql(bucket_name, target_data_source, settings_list, db_info, log_info): + # 個別設定ファイルに拡張SQLファイル名が設定されているかチェック + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-16 - 拡張SQL設定が存在するかチェックします') + ex_sql_file_name = settings_list[SETTINGS_ITEM["exSqlFileName"]] + + if ex_sql_file_name: + try: + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-17 - 拡張SQL設定の存在を確認しました') + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-18 - 拡張SQLファイル名：{ex_sql_file_name} の存在チェック') + ex_sql_key = target_data_source + DIRECTORY_SETTINGS + ex_sql_file_name + s3_client.head_object(Bucket=bucket_name, Key=ex_sql_key) + ex_sql_file_exists = True + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-19 - 拡張SQLファイル名の存在を確認しました') + except Exception: + ex_sql_file_exists = False + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {WARNING} W-CHK-02 - 拡張SQLファイルが存在しません') + + try: + if ex_sql_file_exists: + # 拡張SQLファイルからSQL文生成 + ex_sql_obj_response = s3_client.get_object( + Bucket=bucket_name, Key=ex_sql_key) + ex_sql = '' + for line in io.TextIOWrapper(io.BytesIO(ex_sql_obj_response["Body"].read()), encoding='utf-8'): + ex_sql = f'{ex_sql} {line.rstrip()}' + + # DB接続を開始する + conn = pymysql.connect(host=db_info["host"], port=db_info["port"], user=db_info["user"], passwd=db_info["pass"], + db=db_info["name"], connect_timeout=5, client_flag=CLIENT.MULTI_STATEMENTS, local_infile=True) + # トランザクション開始 + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-20 - 拡張SQL：{ex_sql_file_name} のトランザクションを開始します') + with conn.cursor() as cur: + cur.execute(ex_sql) + conn.commit() + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-21 - 拡張SQL：{ex_sql_file_name} のCOMMIT処理が正常終了しました') + conn.close() + except Exception as e: + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {WARNING} W-CHK-03 - 拡張SQLにエラーが発生しました：{e}') + else: + print( + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-22 - 拡張SQL設定の存在はありませんでした') + + # ローカル実行用コード # 値はよしなに変えてください if __name__ == '__main__': diff --git a/ecs/dataimport/dataimport/common.py b/ecs/dataimport/dataimport/common.py index 0afea617..0f5eb967 100644 --- a/ecs/dataimport/dataimport/common.py +++ b/ecs/dataimport/dataimport/common.py @@ -56,16 +56,18 @@ SETTINGS_ITEM = { 'bulkImportFlag': 14, 'compressedFlag': 15, 'compression': 16, - 'reserved1': 17, - 'reserved2': 18, - 'reserved3': 19, - 'reserved4': 20, - 'reserved5': 21, - 'reserved6': 22, - 'reserved7': 23, - 'reserved8': 24 + 'executeExSqlIfFileEmptyFlag': 17, + 'reserved1': 18, + 'reserved2': 19, + 'reserved3': 20, + 'reserved4': 21, + 'reserved5': 22, + 'reserved6': 23, + 'reserved7': 24 } +DIRECTORY_WORK = '/work/' +DIRECTORY_SETTINGS = '/settings/' LOCAL_DIRECTORY_TMP = '/tmp' # チェック処理で解凍した圧縮ファイルの中身を格納するフォルダ LOCAL_TEMPORARY_FILE_PATH = f'{LOCAL_DIRECTORY_TMP}/temporary_file.dat' diff --git a/ecs/dataimport/dataimport/controller.py b/ecs/dataimport/dataimport/controller.py index d9a639f3..450e328b 100644 --- a/ecs/dataimport/dataimport/controller.py +++ b/ecs/dataimport/dataimport/controller.py @@ -49,7 +49,7 @@ try: print( f'{datetime.now():%Y-%m-%d %H:%M:%S} {LOG_INFO} {LOG_LEVEL["i"]} I-CTRL-03 - チェック処理の呼び出し') check(BUCKET_NAME, DATA_SOURCE_NAME, - FILE_NAME, settings_key, LOG_INFO, MODE) + FILE_NAME, settings_key, DB_INFO, LOG_INFO, MODE) # ④ メイン処理を呼び出す print( diff --git a/ecs/dataimport/dataimport/main.py b/ecs/dataimport/dataimport/main.py index d51a6759..a1197a89 100644 --- a/ecs/dataimport/dataimport/main.py +++ b/ecs/dataimport/dataimport/main.py @@ -4,16 +4,15 @@ from datetime import datetime import boto3 import pymysql -from common import (ERROR, INFO, LINE_FEED_CODE, LOCAL_TEMPORARY_FILE_PATH, +from common import (DIRECTORY_SETTINGS, DIRECTORY_WORK, ERROR, INFO, + LINE_FEED_CODE, LOCAL_TEMPORARY_FILE_PATH, MYSQL_CHARSET_CODE, SETTINGS_ITEM, WARNING, convert_quotechar, debug_log) from error import error from pymysql.constants import CLIENT # 定数 -DIRECTORY_WORK = '/work/' -DIRECTORY_SETTINGS = '/settings/' TRUNCATE_SRC_TABLE_SYMBOL = 'truncate_src_table:' TRUNCATE_SRC_TABLE_IDENTIFY_SYMBOL_FORMAT = f'{TRUNCATE_SRC_TABLE_SYMBOL}[蓄積スキーマのテーブル名]' INVALID_CONFIG_EXCEPTION_MESSAGE = f'個別設定ファイルのインポート方法に不備がありました。　インポート方法は "{TRUNCATE_SRC_TABLE_IDENTIFY_SYMBOL_FORMAT}" のように設定してください' From d2dc09646846bbf7a58b8a9990222d6992c1dcaf Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 16 Jun 2025 16:23:33 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E5=AE=9F=E6=B6=88=E5=8C=96?= =?UTF-8?q?=E5=8F=96=E8=BE=BC=E7=94=A8=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AB=E6=8B=A1=E5=BC=B5SQL?= =?UTF-8?q?=E5=AE=9F=E8=A1=8C=E3=83=95=E3=83=A9=E3=82=B0=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- s3/data/jsk/settings/ATC_PHARM.txt | 3 ++- s3/data/jsk/settings/CUSTOMER_LOTNO_ALL.txt | 3 ++- s3/data/jsk/settings/EMP.txt | 3 ++- s3/data/jsk/settings/HST_RESULT_DATA.txt | 3 ++- s3/data/jsk/settings/IM_PLN_PROD.txt | 3 ++- s3/data/jsk/settings/INST_IM_PLN.txt | 3 ++- s3/data/jsk/settings/MR_YR_PLN_INST_KY.txt | 3 ++- s3/data/jsk/settings/MST_ASSN_PROD_GRP.txt | 3 ++- s3/data/jsk/settings/MST_ATC_PHARM_PROD_GRP.txt | 3 ++- s3/data/jsk/settings/MST_COMPANY.txt | 3 ++- s3/data/jsk/settings/MST_COMPANY_GRP.txt | 3 ++- s3/data/jsk/settings/MST_DEAL_DIV.txt | 3 ++- s3/data/jsk/settings/MST_GENERAL.txt | 3 ++- s3/data/jsk/settings/MST_INST_ASSN.txt | 3 ++- s3/data/jsk/settings/MST_INST_MERCK.txt | 3 ++- s3/data/jsk/settings/MST_JIS_CITY.txt | 3 ++- s3/data/jsk/settings/MST_JIS_PREF.txt | 3 ++- s3/data/jsk/settings/MST_PROD_PKG.txt | 3 ++- s3/data/jsk/settings/MST_SALES_PLACE.txt | 3 ++- s3/data/jsk/settings/MST_WAREHOUSE.txt | 3 ++- s3/data/jsk/settings/MST_WHLSLR.txt | 3 ++- s3/data/jsk/settings/ORG_LVL1.txt | 3 ++- s3/data/jsk/settings/ORG_LVL2.txt | 3 ++- s3/data/jsk/settings/ORG_LVL3.txt | 3 ++- s3/data/jsk/settings/ORG_LVL4.txt | 3 ++- s3/data/jsk/settings/PROD_ASSN_TEAM.txt | 3 ++- s3/data/jsk/settings/PROD_PRICE.txt | 3 ++- s3/data/jsk/settings/TRN_RESULT_DATA.txt | 3 ++- s3/data/jsk/settings/TRN_RESULT_DATA_BIO.txt | 3 ++- s3/data/jsk/settings/TRN_Recive_Inventry.txt | 3 ++- s3/data/jsk/settings/WHLSLR_LVL1.txt | 3 ++- s3/data/jsk/settings/WHLSLR_LVL2.txt | 3 ++- s3/data/jsk/settings/WHLSLR_LVL3.txt | 3 ++- s3/data/jsk/settings/WHLSLR_LVL4.txt | 3 ++- 34 files changed, 68 insertions(+), 34 deletions(-) diff --git a/s3/data/jsk/settings/ATC_PHARM.txt b/s3/data/jsk/settings/ATC_PHARM.txt index af0b0f5f..6fb75dfa 100644 --- a/s3/data/jsk/settings/ATC_PHARM.txt +++ b/s3/data/jsk/settings/ATC_PHARM.txt @@ -14,4 +14,5 @@ ATC_PHARM_ex.sql truncate_src_table:src07.atc_pharm 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/CUSTOMER_LOTNO_ALL.txt b/s3/data/jsk/settings/CUSTOMER_LOTNO_ALL.txt index 878d5000..b435eaa0 100644 --- a/s3/data/jsk/settings/CUSTOMER_LOTNO_ALL.txt +++ b/s3/data/jsk/settings/CUSTOMER_LOTNO_ALL.txt @@ -14,4 +14,5 @@ CUSTOMER_LOTNO_ALL_ex.sql truncate_src_table:src07.customer_lotno_all 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/EMP.txt b/s3/data/jsk/settings/EMP.txt index d2cf8ab1..b0e8597d 100644 --- a/s3/data/jsk/settings/EMP.txt +++ b/s3/data/jsk/settings/EMP.txt @@ -14,4 +14,5 @@ EMP_ex.sql truncate_src_table:src07.emp 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/HST_RESULT_DATA.txt b/s3/data/jsk/settings/HST_RESULT_DATA.txt index cabe8601..0fee8d49 100644 --- a/s3/data/jsk/settings/HST_RESULT_DATA.txt +++ b/s3/data/jsk/settings/HST_RESULT_DATA.txt @@ -14,4 +14,5 @@ HST_RESULT_DATA_ex.sql truncate_src_table:src07.hst_result_data 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/IM_PLN_PROD.txt b/s3/data/jsk/settings/IM_PLN_PROD.txt index 994ed195..5d49b533 100644 --- a/s3/data/jsk/settings/IM_PLN_PROD.txt +++ b/s3/data/jsk/settings/IM_PLN_PROD.txt @@ -14,4 +14,5 @@ IM_PLN_PROD_ex.sql truncate_src_table:src07.im_pln_prod 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/INST_IM_PLN.txt b/s3/data/jsk/settings/INST_IM_PLN.txt index 48e68fd0..a3c9b28e 100644 --- a/s3/data/jsk/settings/INST_IM_PLN.txt +++ b/s3/data/jsk/settings/INST_IM_PLN.txt @@ -14,4 +14,5 @@ INST_IM_PLN_ex.sql truncate_src_table:src07.inst_im_pln 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MR_YR_PLN_INST_KY.txt b/s3/data/jsk/settings/MR_YR_PLN_INST_KY.txt index 08172307..00dd7fa4 100644 --- a/s3/data/jsk/settings/MR_YR_PLN_INST_KY.txt +++ b/s3/data/jsk/settings/MR_YR_PLN_INST_KY.txt @@ -14,4 +14,5 @@ MR_YR_PLN_INST_KY_ex.sql truncate_src_table:src07.mr_yr_pln_inst_ky 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_ASSN_PROD_GRP.txt b/s3/data/jsk/settings/MST_ASSN_PROD_GRP.txt index f50f74a0..bf95a721 100644 --- a/s3/data/jsk/settings/MST_ASSN_PROD_GRP.txt +++ b/s3/data/jsk/settings/MST_ASSN_PROD_GRP.txt @@ -14,4 +14,5 @@ MST_ASSN_PROD_GRP_ex.sql truncate_src_table:src07.mst_assn_prod_grp 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_ATC_PHARM_PROD_GRP.txt b/s3/data/jsk/settings/MST_ATC_PHARM_PROD_GRP.txt index a5bcf823..e33bbfb9 100644 --- a/s3/data/jsk/settings/MST_ATC_PHARM_PROD_GRP.txt +++ b/s3/data/jsk/settings/MST_ATC_PHARM_PROD_GRP.txt @@ -14,4 +14,5 @@ MST_ATC_PHARM_PROD_GRP_ex.sql truncate_src_table:src07.mst_atc_pharm_prod_grp 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_COMPANY.txt b/s3/data/jsk/settings/MST_COMPANY.txt index e1ac7cb4..00628e56 100644 --- a/s3/data/jsk/settings/MST_COMPANY.txt +++ b/s3/data/jsk/settings/MST_COMPANY.txt @@ -14,4 +14,5 @@ MST_COMPANY_ex.sql truncate_src_table:src07.mst_company 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_COMPANY_GRP.txt b/s3/data/jsk/settings/MST_COMPANY_GRP.txt index b5994a10..4b4a2fdd 100644 --- a/s3/data/jsk/settings/MST_COMPANY_GRP.txt +++ b/s3/data/jsk/settings/MST_COMPANY_GRP.txt @@ -14,4 +14,5 @@ MST_COMPANY_GRP_ex.sql truncate_src_table:src07.mst_company_grp 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_DEAL_DIV.txt b/s3/data/jsk/settings/MST_DEAL_DIV.txt index e223096f..ec84f12a 100644 --- a/s3/data/jsk/settings/MST_DEAL_DIV.txt +++ b/s3/data/jsk/settings/MST_DEAL_DIV.txt @@ -14,4 +14,5 @@ MST_DEAL_DIV_ex.sql truncate_src_table:src07.mst_deal_div 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_GENERAL.txt b/s3/data/jsk/settings/MST_GENERAL.txt index 5b3b3ec7..7c84893f 100644 --- a/s3/data/jsk/settings/MST_GENERAL.txt +++ b/s3/data/jsk/settings/MST_GENERAL.txt @@ -14,4 +14,5 @@ MST_GENERAL_ex.sql truncate_src_table:src07.mst_general 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_INST_ASSN.txt b/s3/data/jsk/settings/MST_INST_ASSN.txt index 9d9509b7..32176dc1 100644 --- a/s3/data/jsk/settings/MST_INST_ASSN.txt +++ b/s3/data/jsk/settings/MST_INST_ASSN.txt @@ -14,4 +14,5 @@ MST_INST_ASSN_ex.sql truncate_src_table:src07.mst_inst_assn 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_INST_MERCK.txt b/s3/data/jsk/settings/MST_INST_MERCK.txt index c91ade2e..c7c65f3d 100644 --- a/s3/data/jsk/settings/MST_INST_MERCK.txt +++ b/s3/data/jsk/settings/MST_INST_MERCK.txt @@ -14,4 +14,5 @@ MST_INST_MERCK_ex.sql truncate_src_table:src07.mst_inst_merck 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_JIS_CITY.txt b/s3/data/jsk/settings/MST_JIS_CITY.txt index e656f840..e085550e 100644 --- a/s3/data/jsk/settings/MST_JIS_CITY.txt +++ b/s3/data/jsk/settings/MST_JIS_CITY.txt @@ -14,4 +14,5 @@ MST_JIS_CITY_ex.sql truncate_src_table:src07.mst_jis_city 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_JIS_PREF.txt b/s3/data/jsk/settings/MST_JIS_PREF.txt index d68ad5c7..9e4fef4d 100644 --- a/s3/data/jsk/settings/MST_JIS_PREF.txt +++ b/s3/data/jsk/settings/MST_JIS_PREF.txt @@ -14,4 +14,5 @@ MST_JIS_PREF_ex.sql truncate_src_table:src07.mst_jis_pref 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_PROD_PKG.txt b/s3/data/jsk/settings/MST_PROD_PKG.txt index bdfc863f..2d69182f 100644 --- a/s3/data/jsk/settings/MST_PROD_PKG.txt +++ b/s3/data/jsk/settings/MST_PROD_PKG.txt @@ -14,4 +14,5 @@ MST_PROD_PKG_ex.sql truncate_src_table:src07.mst_prod_pkg 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_SALES_PLACE.txt b/s3/data/jsk/settings/MST_SALES_PLACE.txt index 9f66f4e7..59698f30 100644 --- a/s3/data/jsk/settings/MST_SALES_PLACE.txt +++ b/s3/data/jsk/settings/MST_SALES_PLACE.txt @@ -14,4 +14,5 @@ MST_SALES_PLACE_ex.sql truncate_src_table:src07.mst_sales_place 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_WAREHOUSE.txt b/s3/data/jsk/settings/MST_WAREHOUSE.txt index 0b0f5514..1fd6fcc9 100644 --- a/s3/data/jsk/settings/MST_WAREHOUSE.txt +++ b/s3/data/jsk/settings/MST_WAREHOUSE.txt @@ -14,4 +14,5 @@ MST_WAREHOUSE_ex.sql truncate_src_table:src07.mst_warehouse 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/MST_WHLSLR.txt b/s3/data/jsk/settings/MST_WHLSLR.txt index 3d8a3153..b69c6775 100644 --- a/s3/data/jsk/settings/MST_WHLSLR.txt +++ b/s3/data/jsk/settings/MST_WHLSLR.txt @@ -14,4 +14,5 @@ MST_WHLSLR_ex.sql truncate_src_table:src07.mst_whlslr 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/ORG_LVL1.txt b/s3/data/jsk/settings/ORG_LVL1.txt index abff4a74..6562d01a 100644 --- a/s3/data/jsk/settings/ORG_LVL1.txt +++ b/s3/data/jsk/settings/ORG_LVL1.txt @@ -14,4 +14,5 @@ ORG_LVL1_ex.sql truncate_src_table:src07.org_lvl1 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/ORG_LVL2.txt b/s3/data/jsk/settings/ORG_LVL2.txt index 65154a2e..1db19b14 100644 --- a/s3/data/jsk/settings/ORG_LVL2.txt +++ b/s3/data/jsk/settings/ORG_LVL2.txt @@ -14,4 +14,5 @@ ORG_LVL2_ex.sql truncate_src_table:src07.org_lvl2 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/ORG_LVL3.txt b/s3/data/jsk/settings/ORG_LVL3.txt index 93d57285..e2f7b223 100644 --- a/s3/data/jsk/settings/ORG_LVL3.txt +++ b/s3/data/jsk/settings/ORG_LVL3.txt @@ -14,4 +14,5 @@ ORG_LVL3_ex.sql truncate_src_table:src07.org_lvl3 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/ORG_LVL4.txt b/s3/data/jsk/settings/ORG_LVL4.txt index d0e4f457..82f92d44 100644 --- a/s3/data/jsk/settings/ORG_LVL4.txt +++ b/s3/data/jsk/settings/ORG_LVL4.txt @@ -14,4 +14,5 @@ ORG_LVL4_ex.sql truncate_src_table:src07.org_lvl4 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/PROD_ASSN_TEAM.txt b/s3/data/jsk/settings/PROD_ASSN_TEAM.txt index ce203539..6510f31c 100644 --- a/s3/data/jsk/settings/PROD_ASSN_TEAM.txt +++ b/s3/data/jsk/settings/PROD_ASSN_TEAM.txt @@ -14,4 +14,5 @@ PROD_ASSN_TEAM_ex.sql truncate_src_table:src07.prod_assn_team 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/PROD_PRICE.txt b/s3/data/jsk/settings/PROD_PRICE.txt index cc0df9ab..4fda6bc0 100644 --- a/s3/data/jsk/settings/PROD_PRICE.txt +++ b/s3/data/jsk/settings/PROD_PRICE.txt @@ -14,4 +14,5 @@ PROD_PRICE_ex.sql truncate_src_table:src07.prod_price 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/TRN_RESULT_DATA.txt b/s3/data/jsk/settings/TRN_RESULT_DATA.txt index 28550823..4284c6a2 100644 --- a/s3/data/jsk/settings/TRN_RESULT_DATA.txt +++ b/s3/data/jsk/settings/TRN_RESULT_DATA.txt @@ -14,4 +14,5 @@ TRN_RESULT_DATA_ex.sql truncate_src_table:src07.trn_result_data 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/TRN_RESULT_DATA_BIO.txt b/s3/data/jsk/settings/TRN_RESULT_DATA_BIO.txt index 79271b7a..d6f46d20 100644 --- a/s3/data/jsk/settings/TRN_RESULT_DATA_BIO.txt +++ b/s3/data/jsk/settings/TRN_RESULT_DATA_BIO.txt @@ -14,4 +14,5 @@ TRN_RESULT_DATA_BIO_ex.sql 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/TRN_Recive_Inventry.txt b/s3/data/jsk/settings/TRN_Recive_Inventry.txt index f07a1fff..4daa31b8 100644 --- a/s3/data/jsk/settings/TRN_Recive_Inventry.txt +++ b/s3/data/jsk/settings/TRN_Recive_Inventry.txt @@ -14,4 +14,5 @@ TRN_Recive_Inventry_ex.sql 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/WHLSLR_LVL1.txt b/s3/data/jsk/settings/WHLSLR_LVL1.txt index 4a201195..44f8f8d6 100644 --- a/s3/data/jsk/settings/WHLSLR_LVL1.txt +++ b/s3/data/jsk/settings/WHLSLR_LVL1.txt @@ -14,4 +14,5 @@ WHLSLR_LVL1_ex.sql truncate_src_table:src07.whlslr_lvl1 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/WHLSLR_LVL2.txt b/s3/data/jsk/settings/WHLSLR_LVL2.txt index 8c8bee7b..04523e3c 100644 --- a/s3/data/jsk/settings/WHLSLR_LVL2.txt +++ b/s3/data/jsk/settings/WHLSLR_LVL2.txt @@ -14,4 +14,5 @@ WHLSLR_LVL2_ex.sql truncate_src_table:src07.whlslr_lvl2 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/WHLSLR_LVL3.txt b/s3/data/jsk/settings/WHLSLR_LVL3.txt index 4a894fc6..cb332c5d 100644 --- a/s3/data/jsk/settings/WHLSLR_LVL3.txt +++ b/s3/data/jsk/settings/WHLSLR_LVL3.txt @@ -14,4 +14,5 @@ WHLSLR_LVL3_ex.sql truncate_src_table:src07.whlslr_lvl3 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file diff --git a/s3/data/jsk/settings/WHLSLR_LVL4.txt b/s3/data/jsk/settings/WHLSLR_LVL4.txt index 0c57f5de..25db924d 100644 --- a/s3/data/jsk/settings/WHLSLR_LVL4.txt +++ b/s3/data/jsk/settings/WHLSLR_LVL4.txt @@ -14,4 +14,5 @@ WHLSLR_LVL4_ex.sql truncate_src_table:src07.whlslr_lvl4 1 1 -gzip \ No newline at end of file +gzip +1 \ No newline at end of file From 8418c09d1e3520f0f2f7f66ec1495fb10af37596 Mon Sep 17 00:00:00 2001 From: "shimoda.m@nds-tyo.co.jp" Date: Mon, 16 Jun 2025 17:01:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E3=83=AC=E3=83=93=E3=83=A5?= =?UTF-8?q?=E3=83=BC=E6=8C=87=E6=91=98=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ecs/dataimport/dataimport/chk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ecs/dataimport/dataimport/chk.py b/ecs/dataimport/dataimport/chk.py index 207e898b..b8b86d1f 100644 --- a/ecs/dataimport/dataimport/chk.py +++ b/ecs/dataimport/dataimport/chk.py @@ -94,7 +94,8 @@ def check(bucket_name, target_data_source, target_file_name, settings_key, db_in # 拡張SQL実行フラグがONになっている場合は拡張SQLを実行して処理終了する。 if settings_list[SETTINGS_ITEM["executeExSqlIfFileEmptyFlag"]] == '1': print( - f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-15 - 投入ファイルが０バイトでしたが、拡張SQLを実行します。') + f'{datetime.now():%Y-%m-%d %H:%M:%S} {log_info} {INFO} I-CHK-15 - ' + '投入ファイルが０バイトです。０バイト時の拡張SQL実行フラグが有効なため、拡張SQLを実行します。') execute_ex_sql(bucket_name, target_data_source, settings_list, db_info, log_info) print(