grp_ai / matching_ai

Commit f97db154652a0fdef569be4e91c02774cdd991d8

Authored by 함상기
1 parent e39479a9

.

Showing 6 changed files with 38 additions and 23 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/batch/controller/JobController.java
  Show/Hide comments   View file @f97db15
... ... @@ -55,7 +55,7 @@ public class JobController {
55 55 }
56 56  
57 57 @PostMapping("/create")
58   - public Map<String, String> createJob( @RequestBody Map<String, String> params) throws Exception {
  58 + public Map<String, String> createJob( @RequestBody Map<String, Object> params) throws Exception {
59 59  
60 60 /*
61 61 * {
... ...
src/main/java/com/batch/service/JobService.java
  Show/Hide comments   View file @f97db15
... ... @@ -297,13 +297,14 @@ public class JobService {
297 297 String sCprCode = (String) paramRec.get("cpr_code");
298 298 String sPartCpr = (String) paramRec.get("partn_cpr");
299 299 String sDelngCrncy = (String) paramRec.get("delng_crncy");
  300 + String sTbTy = (String) paramRec.get("tb_ty");
300 301 String sErrorRange = (String) paramRec.get("error_range");
301 302  
302 303 String sThreadName = Thread.currentThread().getName();
303 304  
304 305 log.debug("call python");
305 306 new ProcessExecutor()
306   - .command(sPythonPrg, sPythonAiTarget, sDate, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy, sErrorRange)
  307 + .command(sPythonPrg, sPythonAiTarget, sDate, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy, sTbTy)
307 308 .redirectOutput(new LogOutputStream() {
308 309 @Override
309 310 protected void processLine(String line) {
... ... @@ -352,7 +353,7 @@ public class JobService {
352 353  
353 354 @SuppressWarnings("rawtypes")
354 355 @Async("commAsync")
355   - public void createData(String jobGroupId, Map<String, String> params) throws Exception {
  356 + public void createData(String jobGroupId, Map<String, Object> params) throws Exception {
356 357  
357 358 //Job Create Log
358 359 UUID uuid = UUID.randomUUID();
... ... @@ -410,6 +411,7 @@ public class JobService {
410 411  
411 412 iDeleted = matchingInnerDelingMapper.deleteData(params);
412 413 log.debug("Deleted Work Data : " + iDeleted + "건");
  414 +
413 415 iInserted = matchingInnerDelingMapper.insertDataFromOriginal(params);
414 416 log.info("Inserted Work Data : " + iInserted + "건");
415 417  
... ...
src/main/resources/application.properties
  Show/Hide comments   View file @f97db15
... ... @@ -18,14 +18,14 @@ spring.datasource.hikari.primary.username=account
18 18 spring.datasource.hikari.primary.password=daeucna10!
19 19  
20 20 # secondary
21   -spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
22   -spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C
23   -spring.datasource.hikari.secondary.username=ai
24   -spring.datasource.hikari.secondary.password=ai
25 21 #spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
26   -#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl
27   -#spring.datasource.hikari.secondary.username=CONFINAS3
28   -#spring.datasource.hikari.secondary.password=CONFINAS3
  22 +#spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@vanguardlab.kr:63522/CONFINAS19C
  23 +#spring.datasource.hikari.secondary.username=ai
  24 +#spring.datasource.hikari.secondary.password=ai
  25 +spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
  26 +spring.datasource.hikari.secondary.jdbc-url=jdbc:oracle:thin:@daeuserver2.iptime.org:1521/orcl
  27 +spring.datasource.hikari.secondary.username=CONFINAS3
  28 +spring.datasource.hikari.secondary.password=CONFINAS3
29 29  
30 30  
31 31  
... ... @@ -46,7 +46,7 @@ decorator.datasource.p6spy.enable-logging=true
46 46  
47 47 logging.level.root=info
48 48 logging.level.com.batch=info
49   -logging.level.p6spy=off
  49 +logging.level.p6spy=debug
50 50  
51 51 #Thread Count 설정
52 52 thread.comm.count=10
... ...
src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
  Show/Hide comments   View file @f97db15
... ... @@ -327,6 +327,9 @@
327 327 WHERE
328 328 cons_group = #{sysSe}
329 329 and account_period = #{accnutYm}
  330 + <foreach collection="conds" item="item" open="" close="" separator="">
  331 + and ${item}
  332 + </foreach>
330 333 </update>
331 334  
332 335 <update id="deleteDataAi" parameterType="map">
... ... @@ -522,6 +525,7 @@
522 525 , accnut_ym
523 526 , cpr_code
524 527 , partn_cpr
  528 + , tb_ty
525 529 , delng_crncy
526 530 FROM
527 531 (
... ... @@ -531,6 +535,7 @@
531 535 , cpr_code
532 536 , partn_cpr
533 537 , delng_crncy
  538 + , case when dta_ty in ('11','21','41') then 'T' else 'B' end tb_ty
534 539 , case when count(*) > 0 then 1 else 0 end as cnt
535 540 FROM
536 541 public.batch_tbcr_inner_delng
... ... @@ -551,6 +556,7 @@
551 556 , cpr_code
552 557 , partn_cpr
553 558 , delng_crncy
  559 + , case when dta_ty in ('11','21','41') then 'T' else 'B' end
554 560 union all
555 561 SELECT
556 562 sys_se
... ... @@ -558,6 +564,7 @@
558 564 , partn_cpr as cpr_code
559 565 , cpr_code as partn_cpr
560 566 , delng_crncy
  567 + , case when dta_ty in ('12','22','42') then 'T' else 'B' end as tb_ty
561 568 , case when count(*) > 0 then 1 else 0 end as cnt
562 569 FROM
563 570 public.batch_tbcr_inner_delng
... ... @@ -578,6 +585,7 @@
578 585 , cpr_code
579 586 , partn_cpr
580 587 , delng_crncy
  588 + , case when dta_ty in ('12','22','42') then 'T' else 'B' end
581 589 ) m
582 590 GROUP BY
583 591 sys_se
... ...
src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
  Show/Hide comments   View file @f97db15
... ... @@ -25,7 +25,17 @@
25 25 A.DOCUMENT_NO,
26 26 A.REMARK,
27 27 A.CONS_ACCT_CODE,
28   - B.CONS_ACCT_NAME_0 AS CONS_ACCT_NAME,
  28 + (
  29 + SELECT
  30 + CONS_ACCT_KR_NAME
  31 + FROM TBBC_ACCT_CODE
  32 + WHERE
  33 + CONS_ACCT_CODE = A.CONS_ACCT_CODE
  34 + AND CONS_COA = 'GOV_I_COA'
  35 + AND FS_TYPE = '1'
  36 + AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
  37 + AND ROWNUM = 1
  38 + ) AS CONS_ACCT_NAME,
29 39 A.PROD_CODE,
30 40 A.ADJUST_TYPE,
31 41 A.ADJUST_REMARK,
... ... @@ -44,12 +54,6 @@
44 54 A.ACCT_DATE
45 55 FROM
46 56 TBCR_TRANSACTION_HISTORY A
47   - LEFT OUTER JOIN TBBC_ACCT_CODE_NLS B
48   - ON
49   - B.CONS_ACCT_CODE = A.CONS_ACCT_CODE
50   - AND B.CONS_COA = 'LS_COA'
51   - AND B.FS_TYPE = '1'
52   - AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN B.START_YYMM AND B.END_YYMM
53 57 WHERE
54 58 A.CONS_GROUP = #{sysSe}
55 59 AND A.ACCOUNT_PERIOD = #{accnutYm}
... ... @@ -63,10 +67,7 @@
63 67 FROM TBCR_MATCHING A,
64 68 TBCR_MATCHING_DETAIL B
65 69 WHERE
66   - A.SESSION_ID = B.SESSION_ID
67   - AND A.CONS_GROUP = B.CONS_GROUP
68   - AND A.LEDGER = B.LEDGER
69   - AND A.MATCH_KEY = B.MATCH_KEY
  70 + A.MATCH_KEY = B.MATCH_KEY
70 71 AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
71 72 AND A.CONS_GROUP = #{sysSe}
72 73 AND A.ACCOUNT_PERIOD = #{accnutYm}
... ...
사용법.md
  Show/Hide comments   View file @f97db15
... ... @@ -7,7 +7,11 @@
7 7 http://localhost:8080/api/job/create (post)
8 8 {
9 9 "sysSe": "AI_ALL",
10   - "accnutYm": "202311"
  10 + "accnutYm": "202212",
  11 + "conds": [
  12 + "(equal_check is null or equal_check = 'N')",
  13 + "adjust_type is null"
  14 + ]
11 15 }
12 16  
13 17 .\curl\bin\curl -d '{"sysSe":"AI_ALL", "accnutYm":"202311"}' `
... ...