grp_ai / matching_ai

Commit 9c28833f7aa34c5afccac1a792338b11ebd3fd4f

Authored by ggun12
1 parent 78928007

aiJobSub : 작업종료 처리는 파이썬에서 한다. : 제거

Showing 6 changed files with 109 additions and 15 deletions   Show diff stats
Inline Side-by-side
... ... @@ -99,6 +99,14 @@
99 99 <version>2.3.0</version>
100 100 </dependency>
101 101  
  102 +
  103 + <dependency>
  104 + <groupId>javax.annotation</groupId>
  105 + <artifactId>javax.annotation-api</artifactId>
  106 + <version>1.3.2</version>
  107 + </dependency>
  108 +
  109 +
102 110 </dependencies>
103 111  
104 112 <build>
... ...
src/main/java/com/batch/controller/JobController.java
  Show/Hide comments   View file @9c28833
... ... @@ -35,6 +35,12 @@ public class JobController {
35 35 @Autowired
36 36 private MatchingInnerDelingMapper matchingInnerDelingMapper;
37 37  
  38 +
  39 +
  40 +
  41 + /**
  42 + * TODO : AI 서버에 특정 경로에 생성되는 파일을 읽는(끝에 50줄 정도) API
  43 + * */
38 44  
39 45 @PostMapping("/create")
40 46 public Map<String, String> createJob( @RequestBody Map<String, String> params) throws Exception {
... ...
src/main/java/com/batch/service/JobService.java
  Show/Hide comments   View file @9c28833
... ... @@ -139,8 +139,8 @@ public class JobService {
139 139  
140 140 String sThreadName = Thread.currentThread().getName();
141 141 long startTime = System.currentTimeMillis();
142   - log.info("[" + sThreadName + "]Job Started : " + startTime);
143   - log.debug("[" + sThreadName + "]params=" + paramRec.toString());
  142 + log.info("extra [" + sThreadName + "]Job Started : " + startTime);
  143 + log.debug("extra [" + sThreadName + "]params=" + paramRec.toString());
144 144  
145 145 MatchingExtraProcessorAuto matchingExtraProcessorAuto = new MatchingExtraProcessorAuto(matchingInnerDelingMapper);
146 146  
... ... @@ -164,8 +164,8 @@ public class JobService {
164 164 }
165 165  
166 166 long endTime = System.currentTimeMillis();
167   - log.info("[" + sThreadName + "]Job Ended: " + endTime);
168   - log.info("[" + sThreadName + "]Running Time : " + (endTime - startTime) + "ms");
  167 + log.info("extra [" + sThreadName + "]Job Ended: " + endTime);
  168 + log.info("extra [" + sThreadName + "]Running Time : " + (endTime - startTime) + "ms");
169 169  
170 170 //작업종료에 대한 로그 업데이트
171 171 paramLog.put("exit_code", "0");
... ... @@ -193,8 +193,8 @@ public class JobService {
193 193  
194 194  
195 195 long startTime = System.currentTimeMillis();
196   - log.info("Job Started : " + startTime);
197   - log.debug("params=" + paramRec.toString());
  196 + log.info("ai Job Started : " + startTime);
  197 + log.debug("ai Job params=" + paramRec.toString());
198 198  
199 199 String sSysSe = (String) paramRec.get("sys_se");
200 200 String sAccnutYm = (String) paramRec.get("accnut_ym");
... ... @@ -206,7 +206,7 @@ public class JobService {
206 206  
207 207 log.debug("call python");
208 208 new ProcessExecutor()
209   - .command(sPythonPrg, sPythonAiTarget, sThreadName, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy)
  209 + .command(sPythonPrg, sPythonAiTarget, sDate, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy)
210 210 .redirectOutput(new LogOutputStream() {
211 211 @Override
212 212 protected void processLine(String line) {
... ... @@ -216,14 +216,14 @@ public class JobService {
216 216 .execute();
217 217  
218 218 long endTime = System.currentTimeMillis();
219   - log.info("Job Ended: " + endTime);
220   - log.info("Running Time : " + (endTime - startTime) + "ms");
  219 + log.info("ai Job Ended: " + endTime);
  220 + log.info("ai Job Running Time : " + (endTime - startTime) + "ms");
221 221  
222 222  
223   - //작업종료에 대한 로그 업데이트
224   - paramLog.put("exit_code", "0");
225   - paramLog.put("exit_message", "");
226   - matchingInnerDelingMapper.finishUserJob(paramLog);
  223 +// //작업종료에 대한 로그 업데이트
  224 +// paramLog.put("exit_code", "0");
  225 +// paramLog.put("exit_message", "");
  226 +// matchingInnerDelingMapper.finishUserJob(paramLog);
227 227  
228 228 }
229 229  
... ...
src/main/resources/application.properties
  Show/Hide comments   View file @9c28833
... ... @@ -44,8 +44,8 @@ spring.devtools.restart.enabled=true
44 44 #p6spy query logging
45 45 decorator.datasource.p6spy.enable-logging=true
46 46  
47   -logging.level.root=info
48   -logging.level.com.batch=info
  47 +logging.level.root=debug
  48 +logging.level.com.batch=debug
49 49 logging.level.p6spy=off
50 50  
51 51 #Thread Count 설정
... ...
src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
  Show/Hide comments   View file @9c28833
... ... @@ -573,6 +573,7 @@
573 573 , exit_code
574 574 , exit_message
575 575 , user_job_group
  576 + , log_file_path
576 577 FROM
577 578 public.batch_user_job_status
578 579 WHERE
... ...
src/main/resources/mybatis/secondaryMapper/OracleMapper.xml 0 → 100644
  Show/Hide comments   View file @9c28833
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.batch.mapper.secondary.OracleMapper">
  4 +
  5 + <!-- 작업리스트 -->
  6 + <select id="getOriginalData" parameterType="map" resultType="map">
  7 + SELECT
  8 + A.SESSION_ID,
  9 + A.CONS_GROUP,
  10 + A.LEDGER,
  11 + A.ACCOUNT_PERIOD,
  12 + A.SEQ,
  13 + A.TRAN_TYPE,
  14 + A.OWN_COMP,
  15 + A.TRAN_COMP,
  16 + A.COMP_ACCT_CODE,
  17 + A.COMP_PROD_CODE,
  18 + A.RECON_KEY,
  19 + A.TRAN_DATE,
  20 + A.TRAN_CURRENCY,
  21 + A.TRAN_AMT,
  22 + A.BOOK_AMT,
  23 + A.GROUP_AMT,
  24 + A.BOOK_COST,
  25 + A.DOCUMENT_NO,
  26 + A.REMARK,
  27 + A.CONS_ACCT_CODE,
  28 + B.CONS_ACCT_NAME_0 AS CONS_ACCT_NAME,
  29 + A.PROD_CODE,
  30 + A.ADJUST_TYPE,
  31 + A.ADJUST_REMARK,
  32 + A.IF_ACCOUNT_PERIOD,
  33 + A.IF_COMP_CODE,
  34 + A.IF_FILE_ID,
  35 + A.IF_SOURCE,
  36 + A.EQUAL_CHECK,
  37 + A.CONS_OWN_COMP,
  38 + A.CONS_TRAN_COMP,
  39 + A.INVOICE_NO,
  40 + A.LC_NO,
  41 + A.BL_NO,
  42 + A.OWN_BIZ_NO,
  43 + A.PARTNER_BIZ_NO,
  44 + A.ACCT_DATE
  45 + FROM
  46 + 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 + WHERE
  54 + A.CONS_GROUP = #{sysSe}
  55 + AND A.ACCOUNT_PERIOD = #{accnutYm}
  56 + </select>
  57 +
  58 + <select id="getMatchingInfo" parameterType="map" resultType="map">
  59 + SELECT
  60 + A.MATCH_KEY,
  61 + A.MATCHING_CAUSE,
  62 + B.SEQ
  63 + FROM TBCR_MATCHING A,
  64 + TBCR_MATCHING_DETAIL B
  65 + 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 + AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
  71 + AND A.CONS_GROUP = #{sysSe}
  72 + AND A.ACCOUNT_PERIOD = #{accnutYm}
  73 + </select>
  74 +
  75 + <update id="updateMatchingResult" parameterType="map">
  76 + --결과 업데이트
  77 + </update>
  78 +
  79 +</mapper>
0 80 \ No newline at end of file
... ...