Compare commits

..

No commits in common. "85fc0a53572fe061f84b98016d9fd16f4a55d2b7" and "fd35964144bdfb4f559102c04c38f7353d40b5af" have entirely different histories.

4 changed files with 6 additions and 39 deletions

View File

@ -1,6 +1,5 @@
package com.interplug.qcast.batch; package com.interplug.qcast.batch;
import java.util.Arrays;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -32,8 +31,6 @@ public class JobLauncherController {
@Value("${qsp.master-admin-user-batch-url}") @Value("${qsp.master-admin-user-batch-url}")
private String qspInterfaceUrl; private String qspInterfaceUrl;
@Value("${batch.job.enabled}")
private boolean batchJobEnabled;
/** /**
* 특정 Job을 매핑으로 실행하는 메소드 * 특정 Job을 매핑으로 실행하는 메소드
* *
@ -57,29 +54,6 @@ public class JobLauncherController {
resultMap.put("message", "Job" + jobName + " not found"); resultMap.put("message", "Job" + jobName + " not found");
return resultMap; return resultMap;
} }
String[] arryJob = {
"storeAdditionalJob"
,"BOMJob"
,"materialJob"
,"businessChargerJob"
,"adminUserJob"
,"priceJob"
// ,"commonCodeJob"
,"specialNoteDispItemAdditionalJob"
,"planConfirmJob"
,"estimateSyncJob"
};
if(!batchJobEnabled ){
for(String jobName2 :arryJob){
if(jobName2.equals(jobName)){
resultMap.put("code", "FAILED");
resultMap.put("message", "application.yml :: batch.job.enabled true");
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();
@ -110,7 +84,7 @@ public class JobLauncherController {
*/ */
// @Scheduled(cron = "*/5 * * * * *") // @Scheduled(cron = "*/5 * * * * *")
@Scheduled(cron = "0 55 23 * * *") @Scheduled(cron = "0 55 23 * * *")
public String storeAdditionalJob() throws JobInstanceAlreadyCompleteException, public String storeAdditionalInfoJob() throws JobInstanceAlreadyCompleteException,
JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException { JobExecutionAlreadyRunningException, JobParametersInvalidException, JobRestartException {
String jobName = "storeAdditionalJob"; String jobName = "storeAdditionalJob";

View File

@ -40,9 +40,7 @@ spring:
enabled: false enabled: false
profiles: profiles:
scheduler: Y scheduler: Y
batch:
job:
enabled: true
#QSP url 하나시스운영 #https://jp.qsalesplatform.com #QSP url 하나시스운영 #https://jp.qsalesplatform.com
#QSP url 하나시스개발 #https://121.168.9.37:8080 #QSP url 하나시스개발 #https://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120 #QSP url interplug dev #http://1.248.227.176:8120

View File

@ -41,9 +41,6 @@ spring:
profiles: profiles:
scheduler: Y scheduler: Y
batch:
job:
enabled: true
#QSP #QSP
qsp: qsp:
url: http://1.248.227.176:8120 url: http://1.248.227.176:8120
@ -65,7 +62,7 @@ file:
root.path: C:\\ root.path: C:\\
ini.root.path: C:\\NewEstimate ini.root.path: C:\\NewEstimate
ini.base.filename: 料金シミュレーション.ini ini.base.filename: 料金シミュレーション.ini
ini.drawing.img.path: https://files.hanasys.jp/Drawing ini.drawing.img.path: C:\\NewEstimate\Drawing
front: front:
url: http://localhost:8080 url: http://localhost:8080

View File

@ -14,14 +14,14 @@ spring:
# datasource: # datasource:
# master: # master:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true # jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser # username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) # password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4 # maximum-pool-size: 4
# pool-name: Master-HikariPool # pool-name: Master-HikariPool
# read: # read:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true # jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser # username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) # password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4 # maximum-pool-size: 4
@ -36,9 +36,7 @@ spring:
enabled: false enabled: false
profiles: profiles:
scheduler: Y scheduler: Y
batch:
job:
enabled: false
#QSP url 하나시스운영 #https://jp.qsalesplatform.com #QSP url 하나시스운영 #https://jp.qsalesplatform.com
#QSP url 하나시스개발 #https://121.168.9.37:8080 #QSP url 하나시스개발 #https://121.168.9.37:8080
#QSP url interplug dev #http://1.248.227.176:8120 #QSP url interplug dev #http://1.248.227.176:8120