From f97db154652a0fdef569be4e91c02774cdd991d8 Mon Sep 17 00:00:00 2001 From: ham sangki Date: Mon, 8 Apr 2024 16:41:47 +0900 Subject: [PATCH] . --- src/main/java/com/batch/controller/JobController.java | 2 +- src/main/java/com/batch/service/JobService.java | 6 ++++-- src/main/resources/application.properties | 16 ++++++++-------- src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml | 8 ++++++++ src/main/resources/mybatis/secondaryMapper/OracleMapper.xml | 23 ++++++++++++----------- 사용법.md | 6 +++++- 6 files changed, 38 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/batch/controller/JobController.java b/src/main/java/com/batch/controller/JobController.java index 4932fcf..3e81e97 100644 --- a/src/main/java/com/batch/controller/JobController.java +++ b/src/main/java/com/batch/controller/JobController.java @@ -55,7 +55,7 @@ public class JobController { } @PostMapping("/create") - public Map createJob( @RequestBody Map params) throws Exception { + public Map createJob( @RequestBody Map params) throws Exception { /* * { diff --git a/src/main/java/com/batch/service/JobService.java b/src/main/java/com/batch/service/JobService.java index bfa7dc7..112707b 100644 --- a/src/main/java/com/batch/service/JobService.java +++ b/src/main/java/com/batch/service/JobService.java @@ -297,13 +297,14 @@ public class JobService { String sCprCode = (String) paramRec.get("cpr_code"); String sPartCpr = (String) paramRec.get("partn_cpr"); String sDelngCrncy = (String) paramRec.get("delng_crncy"); + String sTbTy = (String) paramRec.get("tb_ty"); String sErrorRange = (String) paramRec.get("error_range"); String sThreadName = Thread.currentThread().getName(); log.debug("call python"); new ProcessExecutor() - .command(sPythonPrg, sPythonAiTarget, sDate, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy, sErrorRange) + .command(sPythonPrg, sPythonAiTarget, sDate, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy, sTbTy) .redirectOutput(new LogOutputStream() { @Override protected void processLine(String line) { @@ -352,7 +353,7 @@ public class JobService { @SuppressWarnings("rawtypes") @Async("commAsync") - public void createData(String jobGroupId, Map params) throws Exception { + public void createData(String jobGroupId, Map params) throws Exception { //Job Create Log UUID uuid = UUID.randomUUID(); @@ -410,6 +411,7 @@ public class JobService { iDeleted = matchingInnerDelingMapper.deleteData(params); log.debug("Deleted Work Data : " + iDeleted + "건"); + iInserted = matchingInnerDelingMapper.insertDataFromOriginal(params); log.info("Inserted Work Data : " + iInserted + "건"); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 373b089..2f8bce0 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 @@ -46,7 +46,7 @@ decorator.datasource.p6spy.enable-logging=true logging.level.root=info logging.level.com.batch=info -logging.level.p6spy=off +logging.level.p6spy=debug #Thread Count 설정 thread.comm.count=10 diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml index 0b52c75..fc7f825 100644 --- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml +++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml @@ -327,6 +327,9 @@ WHERE cons_group = #{sysSe} and account_period = #{accnutYm} + + and ${item} + @@ -522,6 +525,7 @@ , accnut_ym , cpr_code , partn_cpr + , tb_ty , delng_crncy FROM ( @@ -531,6 +535,7 @@ , cpr_code , partn_cpr , delng_crncy + , case when dta_ty in ('11','21','41') then 'T' else 'B' end tb_ty , case when count(*) > 0 then 1 else 0 end as cnt FROM public.batch_tbcr_inner_delng @@ -551,6 +556,7 @@ , cpr_code , partn_cpr , delng_crncy + , case when dta_ty in ('11','21','41') then 'T' else 'B' end union all SELECT sys_se @@ -558,6 +564,7 @@ , partn_cpr as cpr_code , cpr_code as partn_cpr , delng_crncy + , case when dta_ty in ('12','22','42') then 'T' else 'B' end as tb_ty , case when count(*) > 0 then 1 else 0 end as cnt FROM public.batch_tbcr_inner_delng @@ -578,6 +585,7 @@ , cpr_code , partn_cpr , delng_crncy + , case when dta_ty in ('12','22','42') then 'T' else 'B' end ) m GROUP BY sys_se diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml index 901b4a1..3b7bc58 100644 --- a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml +++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml @@ -25,7 +25,17 @@ A.DOCUMENT_NO, A.REMARK, A.CONS_ACCT_CODE, - B.CONS_ACCT_NAME_0 AS CONS_ACCT_NAME, + ( + SELECT + CONS_ACCT_KR_NAME + FROM TBBC_ACCT_CODE + WHERE + CONS_ACCT_CODE = A.CONS_ACCT_CODE + AND CONS_COA = 'GOV_I_COA' + AND FS_TYPE = '1' + AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM + AND ROWNUM = 1 + ) AS CONS_ACCT_NAME, A.PROD_CODE, A.ADJUST_TYPE, A.ADJUST_REMARK, @@ -44,12 +54,6 @@ A.ACCT_DATE FROM TBCR_TRANSACTION_HISTORY A - LEFT OUTER JOIN TBBC_ACCT_CODE_NLS B - ON - B.CONS_ACCT_CODE = A.CONS_ACCT_CODE - AND B.CONS_COA = 'LS_COA' - AND B.FS_TYPE = '1' - AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN B.START_YYMM AND B.END_YYMM WHERE A.CONS_GROUP = #{sysSe} AND A.ACCOUNT_PERIOD = #{accnutYm} @@ -63,10 +67,7 @@ FROM TBCR_MATCHING A, TBCR_MATCHING_DETAIL B WHERE - 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 + A.MATCH_KEY = B.MATCH_KEY AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD AND A.CONS_GROUP = #{sysSe} AND A.ACCOUNT_PERIOD = #{accnutYm} diff --git a/사용법.md b/사용법.md index 223cb16..d57022e 100644 --- a/사용법.md +++ b/사용법.md @@ -7,7 +7,11 @@ http://localhost:8080/api/job/create (post) { "sysSe": "AI_ALL", - "accnutYm": "202311" + "accnutYm": "202212", + "conds": [ + "(equal_check is null or equal_check = 'N')", + "adjust_type is null" + ] } .\curl\bin\curl -d '{"sysSe":"AI_ALL", "accnutYm":"202311"}' ` -- libgit2 0.21.4