grp_ai / matching_ai

Commit 7eae50080b698a642fa2524d58fab748d0368ba7

Authored by 함상기
1 parent efecfd53

.

Showing 4 changed files with 48 additions and 18 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/batch/service/JobService.java
  Show/Hide comments   View file @7eae500
... ... @@ -299,6 +299,17 @@ public class JobService {
299 299  
300 300 List<Map> retData = matchingInnerDelingMapper.getAiReadData(params);
301 301 BigDecimal bdCurrentRowCount = BigDecimal.ZERO;
  302 +
  303 + //메인jobId
  304 + UUID uuid = UUID.randomUUID();
  305 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd-hh-mm-ss");
  306 + String sDate = dateFormat.format(new Date()) + ":" + uuid.toString();
  307 +
  308 + Map<String, Object> paramLog = new HashMap<String, Object>();
  309 + paramLog.put("user_job_group", jobGroupId);
  310 + paramLog.put("user_job_id", sDate);
  311 + paramLog.put("user_job_name", "AI매칭메인(" + sDate + ")");
  312 + matchingInnerDelingMapper.createUserJob(paramLog);
302 313  
303 314 List<ThreadAiMatching> lThread = new ArrayList<ThreadAiMatching>();
304 315 for(Map curMap : retData) {
... ... @@ -343,6 +354,12 @@ public class JobService {
343 354 log.info("Next Thread Group Processing");
344 355 }
345 356 }
  357 +
  358 + //작업종료에 대한 로그 업데이트(성공)
  359 + paramLog.put("exit_code", "0");
  360 + paramLog.put("exit_message", "");
  361 + matchingInnerDelingMapper.finishUserJob(paramLog);
  362 +
346 363 log.info("Current Group Process End");
347 364 }
348 365  
... ...
src/main/resources/application.properties
  Show/Hide comments   View file @7eae500
... ... @@ -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  
... ...
src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
  Show/Hide comments   View file @7eae500
... ... @@ -438,6 +438,7 @@
438 438 DENSE_RANK() over (order by
439 439 mtch_ty
440 440 , mtch_ky
  441 + , delng_crncy
441 442 , case when dta_ty in ('11','21','31','33','35','37','41') then cpr_code else partn_cpr end
442 443 , case when dta_ty in ('11','21','31','33','35','37','41') then partn_cpr else cpr_code end
443 444 ) AS new_mtch_ky
... ...
src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
  Show/Hide comments   View file @7eae500
... ... @@ -7,10 +7,19 @@
7 7 WITH COMP_INFO AS (
8 8 SELECT DISTINCT
9 9 COMP_CODE AS COMP_CODE
10   - , COMP_KR_NAME AS COMP_NAME
  10 + , (
  11 + SELECT
  12 + COMP_NAME_0
  13 + FROM TBBC_COMPANY_CODE_NLS
  14 + WHERE
  15 + SESSION_ID = A.SESSION_ID
  16 + AND COMP_CODE = A.COMP_CODE
  17 + AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
  18 + AND ROWNUM = 1
  19 + ) AS COMP_NAME
11 20 , BOOK_CURRENCY AS COMP_CURRENCY
12 21 , COMP_COA AS COMP_COA
13   - FROM TBBC_COMPANY_CODE
  22 + FROM TBBC_COMPANY_CODE A
14 23 WHERE
15 24 #{accnutYm} BETWEEN START_YYMM AND END_YYMM
16 25 )
... ... @@ -28,7 +37,7 @@
28 37 A.COMP_ACCT_CODE,
29 38 (
30 39 SELECT DISTINCT
31   - COMP_ACCT_NAME
  40 + COMP_ACCT_CODE
32 41 FROM TBBC_COMP_ACCT_CODE
33 42 WHERE
34 43 FS_TYPE = '1'
... ... @@ -36,7 +45,7 @@
36 45 AND COMP_ACCT_CODE = A.COMP_ACCT_CODE
37 46 AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
38 47 AND ROWNUM = 1
39   - ) AS COMP_ACCT_NAME,
  48 + ) AS COMP_ACCT_NAME,
40 49 A.COMP_PROD_CODE,
41 50 A.RECON_KEY,
42 51 A.TRAN_DATE,
... ... @@ -50,13 +59,13 @@
50 59 A.CONS_ACCT_CODE,
51 60 (
52 61 SELECT
53   - CONS_ACCT_KR_NAME
54   - FROM TBBC_ACCT_CODE
  62 + CONS_ACCT_NAME_0
  63 + FROM TBBC_ACCT_CODE_NLS
55 64 WHERE
56 65 CONS_ACCT_CODE = A.CONS_ACCT_CODE
57   - AND CONS_COA = 'GOV_I_COA'
  66 + AND CONS_COA = 'LS_COA'
58 67 AND FS_TYPE = '1'
59   - AND TO_CHAR(SYSDATE, 'YYYYMM') BETWEEN START_YYMM AND END_YYMM
  68 + AND #{accnutYm} BETWEEN START_YYMM AND END_YYMM
60 69 AND ROWNUM = 1
61 70 ) AS CONS_ACCT_NAME,
62 71 A.PROD_CODE,
... ... @@ -75,8 +84,8 @@
75 84 A.OWN_BIZ_NO,
76 85 A.PARTNER_BIZ_NO,
77 86 A.ACCT_DATE,
78   - NULL AS CREATION_DIV_CODE,
79   - NULL AS COST_MAT_KEY
  87 + A.CREATION_DIV_CODE,
  88 + A.COST_MAT_KEY
80 89 FROM
81 90 TBCR_TRANSACTION_HISTORY A
82 91 INNER JOIN COMP_INFO B
... ... @@ -98,7 +107,10 @@
98 107 FROM TBCR_MATCHING A,
99 108 TBCR_MATCHING_DETAIL B
100 109 WHERE
101   - A.MATCH_KEY = B.MATCH_KEY
  110 + A.SESSION_ID = B.SESSION_ID
  111 + AND A.CONS_GROUP = B.CONS_GROUP
  112 + AND A.LEDGER = B.LEDGER
  113 + AND A.MATCH_KEY = B.MATCH_KEY
102 114 AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
103 115 AND A.CONS_GROUP = #{sysSe}
104 116 AND A.ACCOUNT_PERIOD = #{accnutYm}
... ...