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

ggun12
1 parent 78928007
Showing 6 changed files with 109 additions and 15 deletions Show diff stats
pom.xml
src/main/java/com/batch/controller/JobController.java
src/main/java/com/batch/service/JobService.java
src/main/resources/application.properties
src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml
src/main/resources/mybatis/secondaryMapper/OracleMapper.xml
@@ -99,6 +99,14 @@
 		    <version>2.3.0</version>
 		</dependency>
+
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+
 	</dependencies>
 	<build>
@@ -35,6 +35,12 @@ public class JobController {
     @Autowired
     private MatchingInnerDelingMapper matchingInnerDelingMapper;
+    
+    
+    
+    /**
+     * TODO : AI 서버에 특정 경로에 생성되는 파일을 읽는(끝에 50줄 정도) API 
+     * */
     @PostMapping("/create")
     public Map<String, String> createJob( @RequestBody Map<String, String> params) throws Exception {
@@ -139,8 +139,8 @@ public class JobService {
     	String sThreadName = Thread.currentThread().getName();
     	long startTime = System.currentTimeMillis();
-    	log.info("[" + sThreadName + "]Job Started : " + startTime);
-    	log.debug("[" + sThreadName + "]params=" + paramRec.toString());
+    	log.info("extra [" + sThreadName + "]Job Started : " + startTime);
+    	log.debug("extra [" + sThreadName + "]params=" + paramRec.toString());
     	MatchingExtraProcessorAuto matchingExtraProcessorAuto = new MatchingExtraProcessorAuto(matchingInnerDelingMapper);
@@ -164,8 +164,8 @@ public class JobService {
     	}
     	long endTime = System.currentTimeMillis();
-    	log.info("[" + sThreadName + "]Job Ended: " + endTime);
-    	log.info("[" + sThreadName + "]Running Time : " + (endTime - startTime) + "ms");
+    	log.info("extra [" + sThreadName + "]Job Ended: " + endTime);
+    	log.info("extra [" + sThreadName + "]Running Time : " + (endTime - startTime) + "ms");
     	//작업종료에 대한 로그 업데이트
     	paramLog.put("exit_code", "0");
@@ -193,8 +193,8 @@ public class JobService {
     	long startTime = System.currentTimeMillis();
-    	log.info("Job Started : " + startTime);
-    	log.debug("params=" + paramRec.toString());
+    	log.info("ai Job Started : " + startTime);
+    	log.debug("ai Job params=" + paramRec.toString());
     	String sSysSe = (String) paramRec.get("sys_se");
     	String sAccnutYm = (String) paramRec.get("accnut_ym");
@@ -206,7 +206,7 @@ public class JobService {
     	log.debug("call python");
     	new ProcessExecutor()
-	    	.command(sPythonPrg, sPythonAiTarget, sThreadName, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy)
+	    	.command(sPythonPrg, sPythonAiTarget, sDate, sSysSe, sAccnutYm, sCprCode, sPartCpr, sDelngCrncy)
 	        .redirectOutput(new LogOutputStream() {
 	          @Override
 	          protected void processLine(String line) {
@@ -216,14 +216,14 @@ public class JobService {
 	        .execute();   	
     	long endTime = System.currentTimeMillis();
-    	log.info("Job Ended: " + endTime);
-    	log.info("Running Time : " + (endTime - startTime) + "ms");
+    	log.info("ai Job Ended: " + endTime);
+    	log.info("ai Job Running Time : " + (endTime - startTime) + "ms");
-    	//작업종료에 대한 로그 업데이트
-    	paramLog.put("exit_code", "0");
-    	paramLog.put("exit_message", "");    	
-    	matchingInnerDelingMapper.finishUserJob(paramLog);
+//    	//작업종료에 대한 로그 업데이트
+//    	paramLog.put("exit_code", "0");
+//    	paramLog.put("exit_message", "");    	
+//    	matchingInnerDelingMapper.finishUserJob(paramLog);
     }
@@ -44,8 +44,8 @@ spring.devtools.restart.enabled=true
 #p6spy query logging
 decorator.datasource.p6spy.enable-logging=true 
-logging.level.root=info 
-logging.level.com.batch=info
+logging.level.root=debug 
+logging.level.com.batch=debug
 logging.level.p6spy=off
 #Thread Count 설정
@@ -573,6 +573,7 @@
 		    , exit_code
 		    , exit_message
 		    , user_job_group
+		    , log_file_path
 		FROM
 		    public.batch_user_job_status
 		WHERE
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.batch.mapper.secondary.OracleMapper">
+	
+	<!-- 작업리스트 -->
+	<select id="getOriginalData" parameterType="map" resultType="map">
+		SELECT
+		    A.SESSION_ID,
+		    A.CONS_GROUP,
+		    A.LEDGER,
+		    A.ACCOUNT_PERIOD,
+		    A.SEQ,
+		    A.TRAN_TYPE,
+		    A.OWN_COMP,
+		    A.TRAN_COMP,
+		    A.COMP_ACCT_CODE,
+		    A.COMP_PROD_CODE,
+		    A.RECON_KEY,
+		    A.TRAN_DATE,
+		    A.TRAN_CURRENCY,
+		    A.TRAN_AMT,
+		    A.BOOK_AMT,
+		    A.GROUP_AMT,
+		    A.BOOK_COST,
+		    A.DOCUMENT_NO,
+		    A.REMARK,
+		    A.CONS_ACCT_CODE,
+            B.CONS_ACCT_NAME_0 AS CONS_ACCT_NAME,
+		    A.PROD_CODE,
+		    A.ADJUST_TYPE,
+		    A.ADJUST_REMARK,
+		    A.IF_ACCOUNT_PERIOD,
+		    A.IF_COMP_CODE,
+		    A.IF_FILE_ID,
+		    A.IF_SOURCE,
+		    A.EQUAL_CHECK,
+		    A.CONS_OWN_COMP,
+		    A.CONS_TRAN_COMP,
+		    A.INVOICE_NO,
+		    A.LC_NO,
+		    A.BL_NO,
+		    A.OWN_BIZ_NO,
+		    A.PARTNER_BIZ_NO,
+		    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}
+	</select>
+ 
+ 	<select id="getMatchingInfo" parameterType="map" resultType="map">
+		SELECT
+		    A.MATCH_KEY,
+		    A.MATCHING_CAUSE,
+		    B.SEQ
+		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
+		    AND A.ACCOUNT_PERIOD = B.ACCOUNT_PERIOD
+			AND A.CONS_GROUP = #{sysSe}
+			AND A.ACCOUNT_PERIOD = #{accnutYm}
+	</select>
+	
+	<update id="updateMatchingResult" parameterType="map">
+		--결과 업데이트
+	</update>		
+	
+</mapper>
 \ No newline at end of file