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

Compare commits

base: qcast3:aa694c3c563811e2bb88a3f0d2cb0e7dbbb2810b
Branches Tags
qcast3:main
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
..
compare: qcast3:4b9758846ffe1dca5b358623323d3d21d1c0053d
Branches Tags
qcast3:prd-deploy
qcast3:dev-deploy
qcast3:dev
qcast3:ready_prd
qcast3:feature/rjy-0113
qcast3:feature/dev-jp-001
qcast3:feature/dev_jp
qcast3:feature/batch-config-new
qcast3:feature/dev-yj
qcast3:feature/qcast-886
qcast3:feature/qcast-944
qcast3:feature/qcast-925
qcast3:main

No commits in common. "aa694c3c563811e2bb88a3f0d2cb0e7dbbb2810b" and "4b9758846ffe1dca5b358623323d3d21d1c0053d" have entirely different histories.
aa694c3c56 ... 4b9758846f

4 changed files with 59 additions and 76 deletions
Show Stats 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,9 +121,8 @@ 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";
} }
@ -151,9 +150,7 @@ public class JobLauncherController {
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";
} }
@ -181,9 +178,7 @@ public class JobLauncherController {
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";
@ -212,9 +207,7 @@ public class JobLauncherController {
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";
@ -243,9 +236,7 @@ public class JobLauncherController {
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";
@ -274,9 +265,7 @@ public class JobLauncherController {
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";
@ -332,9 +321,7 @@ public class JobLauncherController {
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";
@ -363,9 +350,7 @@ public class JobLauncherController {
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";
@ -394,9 +379,7 @@ public class JobLauncherController {
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";

8
src/main/resources/config/application-dev.yml
View File

@ -7,11 +7,11 @@ spring:
datasource: datasource:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
#내부 개발계 DB #내부 개발계 DB
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck) password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
#한화 개발계 DB #한화 개발계 DB
jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false #jdbc-url: jdbc:log4jdbc:sqlserver://124.35.22.21:1433;databaseName=NEWPVCAD;encrypt=false;trustServerCertificate=false
password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6) #password: ENC(Zc3J45rtPR/uQDeDOcrnF/iGLlU6U3y6)
username: pvDBuser username: pvDBuser
maximum-pool-size: 4 maximum-pool-size: 4
pool-name: Master-HikariPool pool-name: Master-HikariPool

44
src/main/resources/config/application-prd.yml
View File

@ -4,28 +4,28 @@ server:
#spring #spring
spring: spring:
# datasource:
# driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Master-HikariPool
datasource: datasource:
master: driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy jdbc-url: jdbc:log4jdbc:sqlserver://1.248.227.176:1433;databaseName=NEWPVCAD;encrypt=true;trustServerCertificate=true
jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137:1433;databaseName=NEWPVCAD;encrypt=false;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 # datasource:
read: # 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=false;trustServerCertificate=true # jdbc-url: jdbc:log4jdbc:sqlserver://203.137.191.137: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: Read-HikariPool # pool-name: Master-HikariPool
# read:
# 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
# username: pvDBuser
# password: ENC(W7owprYnvf7vqwO6Piw4dHfVBCSxE4Ck)
# maximum-pool-size: 4
# pool-name: Read-HikariPool
jackson: jackson:
time-zone: Asia/Seoul time-zone: Asia/Seoul
batch: batch:
@ -43,7 +43,7 @@ batch:
#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
qsp: qsp:
url: https://jp.qsalesplatform.com url: http://121.168.9.37:8080
master-store-batch-url: /api/master/storeAdditionalInfo master-store-batch-url: /api/master/storeAdditionalInfo
master-material-batch-url: /api/master/materialList master-material-batch-url: /api/master/materialList
master-bom-batch-url: /api/master/bomList master-bom-batch-url: /api/master/bomList

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx
View File

Binary file not shown.