diff --git a/src/main/java/com/batch/service/JobService.java b/src/main/java/com/batch/service/JobService.java index 043b6cb..a1daaa8 100644 --- a/src/main/java/com/batch/service/JobService.java +++ b/src/main/java/com/batch/service/JobService.java @@ -299,6 +299,17 @@ public class JobService { List retData = matchingInnerDelingMapper.getAiReadData(params); BigDecimal bdCurrentRowCount = BigDecimal.ZERO; + + //메인jobId + UUID uuid = UUID.randomUUID(); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss"); + String sDate = dateFormat.format(new Date()) + ":" + uuid.toString(); + + Map paramLog = new HashMap(); + paramLog.put("user_job_group", jobGroupId); + paramLog.put("user_job_id", sDate); + paramLog.put("user_job_name", "AI매칭메인(" + sDate + ")"); + matchingInnerDelingMapper.createUserJob(paramLog); List lThread = new ArrayList(); for(Map curMap : retData) { @@ -343,6 +354,12 @@ public class JobService { log.info("Next Thread Group Processing"); } } + + //작업종료에 대한 로그 업데이트(성공) + paramLog.put("exit_code", "0"); + paramLog.put("exit_message", ""); + matchingInnerDelingMapper.finishUserJob(paramLog); + log.info("Current Group Process End"); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7d11aa3..87f31e7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,14 +18,14 @@ spring.datasource.hikari.primary.username=account spring.datasource.hikari.primary.password=daeucna10! # secondary -#spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver -#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C -#spring.datasource.hikari.secondary.username=ai -#spring.datasource.hikari.secondary.password=ai spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver -spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl -spring.datasource.hikari.secondary.username=CONFINAS3 -spring.datasource.hikari.secondary.password=CONFINAS3 +spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C +spring.datasource.hikari.secondary.username=ai +spring.datasource.hikari.secondary.password=ai +#spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver +#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl +#spring.datasource.hikari.secondary.username=CONFINAS3 +#spring.datasource.hikari.secondary.password=CONFINAS3 diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml index 2a569a1..b31e79c 100644 --- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml +++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml @@ -438,6 +438,7 @@ DENSE_RANK() over (order by mtch_ty , mtch_ky + , delng_crncy , case when dta_ty in ('11','21','31','33','35','37','41') then cpr_code else partn_cpr end , case when dta_ty in ('11','21','31','33','35','37','41') then partn_cpr else cpr_code end ) AS new_mtch_ky diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml index 07aacd4..9cf4580 100644 --- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml +++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml @@ -7,10 +7,19 @@ WITH COMP_INFO AS ( SELECT DISTINCT COMP_CODE AS COMP_CODE - , COMP_KR_NAME AS COMP_NAME + , ( + SELECT + COMP_NAME_0 + FROM TBBC_COMPANY_CODE_NLS + WHERE + SESSION_ID = A.SESSION_ID + AND COMP_CODE = A.COMP_CODE + AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM + AND ROWNUM = 1 + ) AS COMP_NAME , BOOK_CURRENCY AS COMP_CURRENCY , COMP_COA AS COMP_COA - FROM TBBC_COMPANY_CODE + FROM TBBC_COMPANY_CODE A WHERE #{accnutYm} BETWEEN START_YYMM AND END_YYMM ) @@ -28,7 +37,7 @@ A.COMP_ACCT_CODE, ( SELECT DISTINCT - COMP_ACCT_NAME + COMP_ACCT_CODE FROM TBBC_COMP_ACCT_CODE WHERE FS_TYPE = '1' @@ -36,7 +45,7 @@ AND COMP_ACCT_CODE = A.COMP_ACCT_CODE AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM AND ROWNUM = 1 - ) AS COMP_ACCT_NAME, + ) AS COMP_ACCT_NAME, A.COMP_PROD_CODE, A.RECON_KEY, A.TRAN_DATE, @@ -50,13 +59,13 @@ A.CONS_ACCT_CODE, ( SELECT - CONS_ACCT_KR_NAME - FROM TBBC_ACCT_CODE + CONS_ACCT_NAME_0 + FROM TBBC_ACCT_CODE_NLS WHERE CONS_ACCT_CODE = A.CONS_ACCT_CODE - AND CONS_COA = 'GOV_I_COA' + AND CONS_COA = 'LS_COA' AND FS_TYPE = '1' - AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM + AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM AND ROWNUM = 1 ) AS CONS_ACCT_NAME, A.PROD_CODE, @@ -75,8 +84,8 @@ A.OWN_BIZ_NO, A.PARTNER_BIZ_NO, A.ACCT_DATE, - NULL AS CREATION_DIV_CODE, - NULL AS COST_MAT_KEY + A.CREATION_DIV_CODE, + A.COST_MAT_KEY FROM TBCR_TRANSACTION_HISTORY A INNER JOIN COMP_INFO B @@ -98,7 +107,10 @@ FROM TBCR_MATCHING A, TBCR_MATCHING_DETAIL B WHERE - A.MATCH_KEY = B.MATCH_KEY + A.SESSION_ID = B.SESSION_ID + AND A.CONS_GROUP = B.CONS_GROUP + AND A.LEDGER = B.LEDGER + AND A.MATCH_KEY = B.MATCH_KEY AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD AND A.CONS_GROUP = #{sysSe} AND A.ACCOUNT_PERIOD = #{accnutYm} -- libgit2 0.21.4