qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '배치허용 추가(plan, esti, bom)' (#252) from dev into dev-deploy

Browse Source 
Reviewed-on: #252
This commit is contained in:
ysCha 2025-11-26 10:28:27 +09:00
commit 01be6a5a09
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/interplug/qcast/batch/JobLauncherController.java
View File

@ -218,10 +218,32 @@ public class JobLauncherController {
return "Job " + jobName + " not found";
}
if (!"Y".equals(scheduler) && !"materialJob".equals(jobName) && !"commonCodeJob".equals(jobName) && !"specialNoteDispItemAdditionalJob".equals(jobName)) {
log.info("Scheduler disabled, skipping job {}", jobName);
return "Scheduler disabled";
}
// if (!"Y".equals(scheduler) &&
// !"materialJob".equals(jobName) &&
// !"commonCodeJob".equals(jobName) &&
// !"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 확인 (데이터베이스 기반)
if (isJobRunning(jobName)) {