Compare commits

..

No commits in common. "2702d872aeb0c78d53324070fcabcfd68714a4db" and "3d74a8eea6788578a1b85992dc6eec9636cdc163" have entirely different histories.

5 changed files with 12 additions and 24 deletions

View File

@ -170,35 +170,31 @@ public class JobLauncherController {
* 공통 스케줄러 실행 메소드
*/
private String executeScheduledJob(String jobName) {
// 1. 가장 먼저 스케줄러 설정 확인
if (!"Y".equals(scheduler) && !"materialJob".equals(jobName) && !"commonCodeJob".equals(jobName)) {
log.info("Scheduler disabled, skipping job {}", jobName);
return "Scheduler disabled";
}
// 2. Job 존재 확인
Job job = jobs.get(jobName);
if (job == null) {
log.error("Job {} not found", jobName);
return "Job " + jobName + " not found";
}
// 3. 다른 Job 실행 중인지 확인
if (!"Y".equals(scheduler) && !"materialJob".equals(jobName) && !"commonCodeJob".equals(jobName)) {
log.info("Scheduler disabled, skipping job {}", jobName);
return "Scheduler disabled";
}
// 실행 중인 Job 확인
if (runningJobs.contains(jobName) || isJobRunning(jobName)) {
log.warn("Job {} is already running, skipping execution", jobName);
return "Job already running";
}
// 다른 Job이 실행 중인지 확인
if (isAnyJobRunning()) {
log.warn("Another job is running, skipping job {}", jobName);
return "Another job is running";
}
// 4. 같은 Job이 실행 중인지 확인
if (runningJobs.contains(jobName) || isJobRunning(jobName)) {
log.warn("Job {} is already running", jobName);
return "Job already running";
}
// 5. Job 실행
try {
runningJobs.add(jobName);
log.info("Starting job {}", jobName);
JobParameters jobParameters = new JobParametersBuilder()
.addDate("time", new Date())

View File

@ -3,10 +3,8 @@ package com.interplug.qcast.biz.displayItem.dto;
import com.interplug.qcast.util.DefaultResponse;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** Bom 아이템 동기화 Response */
@EqualsAndHashCode(callSuper = true)
@Data
public class BomSyncResponse extends DefaultResponse {

View File

@ -3,10 +3,8 @@ package com.interplug.qcast.biz.displayItem.dto;
import com.interplug.qcast.util.DefaultResponse;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** 아이템 동기화 Response */
@EqualsAndHashCode(callSuper = false)
@Data
public class ItemSyncResponse extends DefaultResponse {
@Schema(description = "Material Number")

View File

@ -3,10 +3,8 @@ package com.interplug.qcast.biz.displayItem.dto;
import com.interplug.qcast.util.DefaultResponse;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** 아이템 동기화 Response */
@EqualsAndHashCode(callSuper = false)
@Data
public class PriceItemSyncResponse extends DefaultResponse {
@Schema(description = "Price Pattern(정가 : 510,.A가격 : 513, C가격 : 514)")

View File

@ -4,10 +4,8 @@ import com.interplug.qcast.util.DefaultResponse;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.Data;
import lombok.EqualsAndHashCode;
/** 가격 동기화 Response */
@EqualsAndHashCode(callSuper = false)
@Data
public class PriceSyncResponse extends DefaultResponse {