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

Reviewed-on: #110

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("${batch.job.enabled}")
+  @Value("${spring.profiles.scheduler}")
-  private boolean batchJobEnabled;
+  private String scheduler;
   /**
    * 특정 Job을 매핑으로 실행하는 메소드
    *
@@ -118,12 +118,12 @@ public class JobLauncherController {
     if (job == null) {
       return "Job " + jobName + " not found";
     }
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-      if (batchJobEnabled) {
+
          jobLauncher.run(job, jobParameters);
-      }
+
     }
     return "OK";
   }
@@ -147,13 +147,12 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-      }
+
     }
     return "OK";
   }
@@ -177,13 +176,12 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-      }
+
     }
 
     return "OK";
@@ -208,13 +206,11 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-
-      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-      }
+
     }
 
     return "OK";
@@ -239,13 +235,11 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-
-      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-      }
+
     }
 
     return "OK";
@@ -270,13 +264,11 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-
-      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-      }
+
     }
 
     return "OK";
@@ -301,7 +293,7 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
@@ -328,13 +320,11 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
-
-      if (batchJobEnabled) {
         jobLauncher.run(job, jobParameters);
-      }
+
     }
 
     return "OK";
@@ -359,13 +349,13 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(scheduler)) {
       JobParameters jobParameters =
           new JobParametersBuilder().addDate("time", new Date()).toJobParameters();
 
-      if (batchJobEnabled) {
+
         jobLauncher.run(job, jobParameters);
-      }
+
     }
 
     return "OK";
@@ -390,13 +380,12 @@ public class JobLauncherController {
       return "Job " + jobName + " not found";
     }
 
-    if ("Y".equals(System.getProperty("spring.profiles.scheduler"))) {
+    if ("Y".equals(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,7 +54,8 @@ public class MasterController {
   public ApiResponse<List<ApiModuleTpResponse>> getModuleTypeItemList(
       HttpServletRequest request,
       @Parameter(description = "지붕재 코드 목록") @RequestParam("arrRoofMatlCd")
-          List<String> roofMaterialCd)
+          List<String> roofMaterialCd,
+      @Parameter(description = "storeId") @RequestParam("storeId") String storeId)
       throws QcastException {
     if (roofMaterialCd == null
         || roofMaterialCd.isEmpty()
@@ -62,7 +63,8 @@ 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);
+    return masterService.getModuleTypeItemList(
+        request.getHeader("Referer"), roofMaterialCd, storeId);
   }
 
   @Operation(description = "가대 목록 조회한다.")

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

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

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

@@ -15,6 +15,10 @@ 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,9 +25,6 @@ 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,9 +25,6 @@ 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,10 +23,8 @@ spring:
       names: ${job.name:NONE}
       enabled: false
   profiles:
-    scheduler: Y
+    scheduler: N
-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,9 +52,6 @@ management:
     health:
       enabled: true
 
-batch:
-  job:
-    enabled: true
 
 file:
   root.path: /home/development/public/files