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

Merge pull request 'dev' (#51) from dev into dev-deploy

Browse Source 
Reviewed-on: #51
This commit is contained in:
ysCha 2025-06-04 09:12:18 +09:00
commit 85cf050d5f
1 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,29 +57,29 @@ public class JobLauncherController {
resultMap.put("message", "Job" + jobName + " not found"); resultMap.put("message", "Job" + jobName + " not found");
return resultMap; return resultMap;
} }
String[] arryJob = { // String[] arryJob = {
"storeAdditionalJob" // "storeAdditionalJob"
,"BOMJob" // ,"BOMJob"
,"materialJob" // ,"materialJob"
,"businessChargerJob" // ,"businessChargerJob"
,"adminUserJob" // ,"adminUserJob"
,"priceJob" // ,"priceJob"
// ,"commonCodeJob" //// ,"commonCodeJob"
,"specialNoteDispItemAdditionalJob" // ,"specialNoteDispItemAdditionalJob"
,"planConfirmJob" // ,"planConfirmJob"
,"estimateSyncJob" // ,"estimateSyncJob"
}; // };
//
//
if(!batchJobEnabled ){ // if(!batchJobEnabled ){
for(String jobName2 :arryJob){ // for(String jobName2 :arryJob){
if(jobName2.equals(jobName)){ // if(jobName2.equals(jobName)){
resultMap.put("code", "FAILED"); // resultMap.put("code", "FAILED");
resultMap.put("message", "application.yml :: batch.job.enabled true"); // resultMap.put("message", "application.yml :: batch.job.enabled true");
return resultMap; // return resultMap;
} // }
} // }
} // }
JobParameters jobParameters = new JobParametersBuilder().addString("jobName", jobName) JobParameters jobParameters = new JobParametersBuilder().addString("jobName", jobName)
.addDate("time", new Date()).toJobParameters(); .addDate("time", new Date()).toJobParameters();
@ -121,8 +121,9 @@ public class JobLauncherController {
if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) { if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
if (batchJobEnabled) {
jobLauncher.run(job, jobParameters); jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
} }
@ -150,7 +151,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
} }
@ -178,7 +181,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
@ -207,7 +212,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
@ -236,7 +243,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
@ -265,7 +274,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
@ -321,7 +332,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
@ -350,7 +363,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";
@ -379,7 +394,9 @@ public class JobLauncherController {
JobParameters jobParameters = JobParameters jobParameters =
new JobParametersBuilder().addDate("time", new Date()).toJobParameters(); new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
jobLauncher.run(job, jobParameters); if (batchJobEnabled) {
jobLauncher.run(job, jobParameters);
}
} }
return "OK"; return "OK";