From 9c28833f7aa34c5afccac1a792338b11ebd3fd4f Mon Sep 17 00:00:00 2001 From: ggun12 Date: Mon, 11 Mar 2024 10:40:05 +0900 Subject: [PATCH] aiJobSub : 작업종료 처리는 파이썬에서 한다. : 제거 --- pom.xml | 8 ++++++++ src/main/java/com/batch/controller/JobController.java | 6 ++++++ src/main/java/com/batch/service/JobService.java | 26 +++++++++++++------------- src/main/resources/application.properties | 4 ++-- src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml | 1 + src/main/resources/mybatis/secondaryMapper/OracleMapper.xml | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 src/main/resources/mybatis/secondaryMapper/OracleMapper.xml diff --git a/pom.xml b/pom.xml index 3eb27cd..45c262b 100644 --- a/pom.xml +++ b/pom.xml @@ -99,6 +99,14 @@ 2.3.0 + + + javax.annotation + javax.annotation-api + 1.3.2 + + + diff --git a/src/main/java/com/batch/controller/JobController.java b/src/main/java/com/batch/controller/JobController.java index 38cbf82..64c5a78 100644 --- a/src/main/java/com/batch/controller/JobController.java +++ b/src/main/java/com/batch/controller/JobController.java @@ -35,6 +35,12 @@ public class JobController { @Autowired private MatchingInnerDelingMapper matchingInnerDelingMapper; + + + + /** + * TODO : AI 서버에 특정 경로에 생성되는 파일을 읽는(끝에 50줄 정도) API + * */ @PostMapping("/create") 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 a409137..72e4125 100644 --- a/src/main/java/com/batch/service/JobService.java +++ b/src/main/java/com/batch/service/JobService.java @@ -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); } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 373b089..d2000c1 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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 설정 diff --git a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml index 501e970..5724824 100644 --- a/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml +++ b/src/main/resources/mybatis/primaryMapper/MatchingInnerDelingMapper.xml @@ -573,6 +573,7 @@ , exit_code , exit_message , user_job_group + , log_file_path FROM public.batch_user_job_status WHERE diff --git a/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml new file mode 100644 index 0000000..901b4a1 --- /dev/null +++ b/src/main/resources/mybatis/secondaryMapper/OracleMapper.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + --결과 업데이트 + + + \ No newline at end of file -- libgit2 0.21.4