From 72aeafd1383163762c13dd44a95b44c77a957fc8 Mon Sep 17 00:00:00 2001 From: basssy Date: Fri, 27 Dec 2024 08:15:32 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=20QSP=EC=97=90=EC=84=9C=20?= =?UTF-8?q?=EC=88=98=EB=8F=99=EC=9C=BC=EB=A1=9C=20=EC=8B=A4=ED=96=89?= =?UTF-8?q?=EC=8B=9C=ED=82=AC=20=EB=95=8C=20=EB=A6=AC=ED=84=B4=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/batch/JobLauncherController.java | 117 ++++++++---------- .../qcast/biz/commCode/CommCodeService.java | 28 ++--- 2 files changed, 63 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/interplug/qcast/batch/JobLauncherController.java b/src/main/java/com/interplug/qcast/batch/JobLauncherController.java index 0e97a73f..caca7c85 100644 --- a/src/main/java/com/interplug/qcast/batch/JobLauncherController.java +++ b/src/main/java/com/interplug/qcast/batch/JobLauncherController.java @@ -1,9 +1,12 @@ package com.interplug.qcast.batch; import java.util.Date; +import java.util.HashMap; import java.util.Map; -import lombok.RequiredArgsConstructor; +import org.springframework.batch.core.BatchStatus; +import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Job; +import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.JobParametersInvalidException; @@ -16,6 +19,7 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import lombok.RequiredArgsConstructor; @RestController @RequiredArgsConstructor @@ -38,26 +42,41 @@ public class JobLauncherController { * @throws JobRestartException */ @GetMapping("/batch/job/{jobName}") // Path Variable로 jobName을 받음 - public String launchJob(@PathVariable String jobName) - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public Map launchJob(@PathVariable String jobName) + throws JobInstanceAlreadyCompleteException, JobExecutionAlreadyRunningException, + JobParametersInvalidException, JobRestartException { Job job = jobs.get(jobName); + Map resultMap = new HashMap(); if (job == null) { - return "Job " + jobName + " not found"; + // return "Job " + jobName + " not found"; + resultMap.put("code", "FAILED"); + resultMap.put("message", "Job" + jobName + " not found"); + return resultMap; } - JobParameters jobParameters = - new JobParametersBuilder() - .addString("jobName", jobName) - .addDate("time", new Date()) - .toJobParameters(); + JobParameters jobParameters = new JobParametersBuilder().addString("jobName", jobName) + .addDate("time", new Date()).toJobParameters(); - jobLauncher.run(job, jobParameters); + JobExecution jobExecution = jobLauncher.run(job, jobParameters); - return "Job " + jobName + " started"; + + + BatchStatus status = jobExecution.getStatus(); + ExitStatus exitStatus = jobExecution.getExitStatus(); + + if ("COMPLETED".equals(status.toString())) { + resultMap.put("code", status.toString()); + resultMap.put("message", exitStatus.getExitDescription()); + + } else { + resultMap.put("code", status.toString()); + resultMap.put("message", exitStatus.getExitDescription()); + } + + + // return "Job " + jobName + " started"; + return resultMap; } /** @@ -71,11 +90,8 @@ public class JobLauncherController { */ // @Scheduled(cron = "*/5 * * * * *") @Scheduled(cron = "0 55 23 * * *") - public String storeAdditionalInfoJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String storeAdditionalInfoJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "storeAdditionalJob"; Job job = jobs.get(jobName); @@ -101,11 +117,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 30 02 * * *") - public String materialJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String materialJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "materialJob"; Job job = jobs.get(jobName); @@ -132,11 +145,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 40 02 * * *") - public String bomJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String bomJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "bomJob"; Job job = jobs.get(jobName); @@ -164,11 +174,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 40 03 * * *") - public String businessChargerJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String businessChargerJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "businessChargerJob"; Job job = jobs.get(jobName); @@ -196,11 +203,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 0 01 * * *") - public String adminUserJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String adminUserJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "adminUserJob"; Job job = jobs.get(jobName); @@ -228,11 +232,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 0 0 * * *") - public String priceJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String priceJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "priceJob"; Job job = jobs.get(jobName); @@ -260,11 +261,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 10 03 * * *") - public String commonCodeJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String commonCodeJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "commonCodeJob"; Job job = jobs.get(jobName); @@ -291,11 +289,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "0 30 23 * * *") - public String specialNoteDispItemAdditionalInfoJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String specialNoteDispItemAdditionalInfoJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "specialNoteDispItemAdditionalJob"; Job job = jobs.get(jobName); if (job == null) { @@ -322,11 +317,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "1 0 0 * * *") - public String planConfirmJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String planConfirmJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "planConfirmJob"; Job job = jobs.get(jobName); @@ -354,11 +346,8 @@ public class JobLauncherController { * @throws JobRestartException */ @Scheduled(cron = "1 20 0 * * *") - public String estimateSyncJob() - throws JobInstanceAlreadyCompleteException, - JobExecutionAlreadyRunningException, - JobParametersInvalidException, - JobRestartException { + public String estimateSyncJob() throws JobInstanceAlreadyCompleteException, + JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { String jobName = "estimateSyncJob"; Job job = jobs.get(jobName); diff --git a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java index 4aed68c5..7e128809 100644 --- a/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java +++ b/src/main/java/com/interplug/qcast/biz/commCode/CommCodeService.java @@ -71,16 +71,12 @@ public class CommCodeService { public void setHeaderCodeSyncSave(List headCodeList) throws Exception { // 헤더코드 동기화 for (HeadCodeRequest headCodeReq : headCodeList) { - try { - if ("Y".equals(headCodeReq.getQcCommYn()) && "N".equals(headCodeReq.getDelYn())) { - headCodeReq.setDelFlg(0); - } else { - headCodeReq.setDelFlg(1); - } - commCodeMapper.setHeadCodeSyncSave(headCodeReq); - } catch (Exception e) { - log.error(e.getMessage()); + if ("Y".equals(headCodeReq.getQcCommYn()) && "N".equals(headCodeReq.getDelYn())) { + headCodeReq.setDelFlg(0); + } else { + headCodeReq.setDelFlg(1); } + commCodeMapper.setHeadCodeSyncSave(headCodeReq); } } @@ -93,16 +89,12 @@ public class CommCodeService { public void setCommonCodeSyncSave(List detailCodeList) throws Exception { // 상세코드 동기화 for (DetailCodeRequest detailCodeReq : detailCodeList) { - try { - if ("A".equals(detailCodeReq.getStatCd()) && "N".equals(detailCodeReq.getDelYn())) { - detailCodeReq.setDelFlg(0); - } else { - detailCodeReq.setDelFlg(1); - } - commCodeMapper.setCommonCodeSyncSave(detailCodeReq); - } catch (Exception e) { - log.error(e.getMessage()); + if ("A".equals(detailCodeReq.getStatCd()) && "N".equals(detailCodeReq.getDelYn())) { + detailCodeReq.setDelFlg(0); + } else { + detailCodeReq.setDelFlg(1); } + commCodeMapper.setCommonCodeSyncSave(detailCodeReq); } } }