src/main/java/com/interplug/qcast/batch/JobLauncherController.java

@@ -32,8 +32,8 @@ public class JobLauncherController {
   @Value("${qsp.master-admin-user-batch-url}")
   private String qspInterfaceUrl;
 
-  @Value("${spring.profiles.scheduler}")
-  private String scheduler;
+  @Value("${batch.job.enabled}")
+  private boolean batchJobEnabled;
   /**
    * 특정 Job을 매핑으로 실행하는 메소드
    *
@@ -118,12 +118,12 @@ public class JobLauncherController {
     if (job == null) {
       return "Job " + jobName + " not found";
     }
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-
+      if (batchJobEnabled) {
          jobLauncher.run(job, jobParameters);
-
+      }
     }
     return "OK";
   }
@@ -147,12 +147,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
+      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-
+      }
     }
     return "OK";
   }
@@ -176,12 +177,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
+      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-
+      }
     }
 
     return "OK";
@@ -206,11 +208,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-        jobLauncher.run(job, jobParameters);
 
+      if (batchJobEnabled) {
+        jobLauncher.run(job, jobParameters);
+      }
     }
 
     return "OK";
@@ -235,11 +239,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-        jobLauncher.run(job, jobParameters);
 
+      if (batchJobEnabled) {
+        jobLauncher.run(job, jobParameters);
+      }
     }
 
     return "OK";
@@ -264,11 +270,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-        jobLauncher.run(job, jobParameters);
 
+      if (batchJobEnabled) {
+        jobLauncher.run(job, jobParameters);
+      }
     }
 
     return "OK";
@@ -293,7 +301,7 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
@@ -320,11 +328,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-        jobLauncher.run(job, jobParameters);
 
+      if (batchJobEnabled) {
+        jobLauncher.run(job, jobParameters);
+      }
     }
 
     return "OK";
@@ -349,13 +359,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-
+      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-
+      }
     }
 
     return "OK";
@@ -380,12 +390,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(scheduler)) {
+    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
+      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-
+      }
     }
 
     return "OK";

src/main/java/com/interplug/qcast/biz/master/MasterController.java

@@ -54,8 +54,7 @@ public class MasterController {
   public ApiResponse<List<ApiModuleTpResponse>> getModuleTypeItemList(
       HttpServletRequest request,
       @Parameter(description = "지붕재 코드 목록") @RequestParam("arrRoofMatlCd")
-          List<String> roofMaterialCd,
-      @Parameter(description = "storeId") @RequestParam("storeId") String storeId)
+          List<String> roofMaterialCd)
       throws QcastException {
     if (roofMaterialCd == null
         || roofMaterialCd.isEmpty()
@@ -63,8 +62,7 @@ public class MasterController {
         || roofMaterialCd.stream().anyMatch(s -> s == null || s.trim().isEmpty())) {
       throw new QcastException(ErrorCode.INVALID_INPUT_VALUE);
     }
-    return masterService.getModuleTypeItemList(
-        request.getHeader("Referer"), roofMaterialCd, storeId);
+    return masterService.getModuleTypeItemList(request.getHeader("Referer"), roofMaterialCd);
   }
 
   @Operation(description = "가대 목록 조회한다.")

src/main/java/com/interplug/qcast/biz/master/MasterService.java

@@ -37,8 +37,7 @@ public interface MasterService {
   @GetMapping("/moduleTypeItemList")
   public ApiResponse<List<ApiModuleTpResponse>> getModuleTypeItemList(
       @RequestHeader("Referer") String referer,
-      @RequestParam("arrRoofMatlCd") List<String> roofMaterialCd,
-      @RequestParam("storeId") String storeId);
+      @RequestParam("arrRoofMatlCd") List<String> roofMaterialCd);
 
   // 가대 목록 조회
   @GetMapping("/trestle")

src/main/java/com/interplug/qcast/biz/master/dto/pcs/series/ApiPcsSeriesItemRequest.java

@@ -15,10 +15,6 @@ public class ApiPcsSeriesItemRequest {
   @NotNull
   public String pcsMkrCd;
 
-  @Schema(description = "storeId")
-  @NotNull
-  public String storeId;
-
   @Schema(description = "PCS시리즈코드 목록")
   @NotNull
   public List<ApiPcsSeriesItemPcsCodeRequest> pcsSerList;

src/main/resources/config/application-dev.yml

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

src/main/resources/config/application-local.yml

@@ -25,6 +25,9 @@ spring:
       enabled: false
   profiles:
     scheduler: Y
+batch:
+  job:
+    enabled: true
 #QSP
 qsp:
   url: http://1.248.227.176:8120

src/main/resources/config/application-prd.yml

@@ -23,8 +23,10 @@ spring:
       names: ${job.name:NONE}
       enabled: false
   profiles:
-    scheduler: N
-
+    scheduler: Y
+batch:
+  job:
+    enabled: false
 #QSP url 하나시스운영 #https://jp.qsalesplatform.com
 #QSP url 하나시스개발 #http://121.168.9.37:8080
 #QSP url interplug dev #http://1.248.227.176:8120

src/main/resources/config/application.yml

@@ -52,6 +52,9 @@ management:
     health:
       enabled: true
 
+batch:
+  job:
+    enabled: true
 
 file:
   root.path: /home/development/public/files