Compare commits

..

No commits in common. "01be6a5a091f6803d46f538c05964be0025155b9" and "ac63eccb778d7f6d7a26587380b3398c0dc5c252" have entirely different histories.

View File

@ -218,32 +218,10 @@ public class JobLauncherController {
return "Job " + jobName + " not found"; return "Job " + jobName + " not found";
} }
// if (!"Y".equals(scheduler) && if (!"Y".equals(scheduler) && !"materialJob".equals(jobName) && !"commonCodeJob".equals(jobName) && !"specialNoteDispItemAdditionalJob".equals(jobName)) {
// !"materialJob".equals(jobName) && log.info("Scheduler disabled, skipping job {}", jobName);
// !"commonCodeJob".equals(jobName) && return "Scheduler disabled";
// !"specialNoteDispItemAdditionalJob".equals(jobName) && }
// !"planConfirmJob".equals(jobName) &&
// !"estimateSyncJob".equals(jobName) &&
// !"bomJob".equals(jobName)){
// log.info("Scheduler disabled, skipping job {}", jobName);
// return "Scheduler disabled";
// }
// 허용된 작업 목록 정의
Set<String> allowedJobs = new HashSet<>(Arrays.asList(
"materialJob",
"commonCodeJob",
"specialNoteDispItemAdditionalJob",
"planConfirmJob",
"estimateSyncJob",
"bomJob"
));
// 스케줄러가 비활성화되어 있고, 허용된 작업이 아닌 경우
if (!"Y".equals(scheduler) && !allowedJobs.contains(jobName)) {
log.info("스케줄러가 비활성화되어 작업을 건너뜁니다: {}", jobName);
return "Scheduler disabled";
}
// 실행 중인 Job 확인 (데이터베이스 기반) // 실행 중인 Job 확인 (데이터베이스 기반)
if (isJobRunning(jobName)) { if (isJobRunning(jobName)) {