From e5f7e728b0a7364f7fcbe5d32576ff0590a89e14 Mon Sep 17 00:00:00 2001
From: changkyu choi <okoookoo@naver.com>
Date: Wed, 11 Dec 2024 18:12:09 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=20API=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvasSetting/dto/CanvasSettingInfo.java  |  2 +-
 .../qcast/biz/master/MasterController.java    | 30 +++++++++----------
 .../qcast/biz/master/MasterService.java       | 14 ++++-----
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java
index 64670aec..1ccfd594 100644
--- a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java
+++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java
@@ -37,7 +37,7 @@ public class CanvasSettingInfo {
 	private Integer gridHorizon;
 	private Integer gridVertical;
 	private Integer gridRatio;
-	private Integer	gridDimen;
+	private String	gridDimen;
 	private String 	gridColor;
 	private String 	wordFont;
 	private String 	wordFontStyle;
diff --git a/src/main/java/com/interplug/qcast/biz/master/MasterController.java b/src/main/java/com/interplug/qcast/biz/master/MasterController.java
index 3b19ce46..9518fedf 100644
--- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java
+++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java
@@ -11,12 +11,12 @@ import com.interplug.qcast.biz.master.dto.ApiTrestleRequest;
 import com.interplug.qcast.biz.master.dto.ApiTrestleResponse;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import java.util.List;
 import lombok.RequiredArgsConstructor;
+
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -40,23 +40,21 @@ public class MasterController {
     return masterService.getModuleTypeItemList(roofMaterialCd);
   }
 
-  @Operation(description = "Q.CAST용 가대 목록 조회")
+  @Operation(description = "가대 목록 조회")
   @PostMapping("/getTrestleList")
-  public List<ApiTrestleResponse> getTrestleList(@RequestBody ApiTrestleRequest params) {
-    return masterService.getTrestleList(params);
+  public ApiResponse<ApiTrestleResponse> getTrestleList(@SpringQueryMap ApiTrestleRequest params) {
+      return masterService.getTrestleList(params);
   }
-
-  @Operation(description = "Q.CAST용 시공법 목록 조회")
+  
+  @Operation(description = "시공법 목록 조회")
   @PostMapping("/getConstructionList")
-  public List<ApiConstructionResponse> getConstructionList(
-      @RequestBody ApiConstructionRequest params) {
-    return masterService.getConstructionList(params);
+  public ApiResponse<ApiConstructionResponse> getConstructionList(@SpringQueryMap ApiConstructionRequest params) {
+      return masterService.getConstructionList(params);
   }
-
-  @Operation(description = "Q.CAST용 가대 상세 조회")
-  @PostMapping("/getConstructionDetailList")
-  public List<ApiTrestleDetailResponse> getConstructionDetailList(
-      @RequestBody ApiTrestleDetailRequest params) {
-    return masterService.getConstructionDetailList(params);
+  
+  @Operation(description = "가대 상세 조회")
+  @PostMapping("/getTrestleDetailList")
+  public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(@SpringQueryMap ApiTrestleDetailRequest params) {
+      return masterService.getTrestleDetailList(params);
   }
 }
diff --git a/src/main/java/com/interplug/qcast/biz/master/MasterService.java b/src/main/java/com/interplug/qcast/biz/master/MasterService.java
index 43ab1bd5..71f8e623 100644
--- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java
+++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java
@@ -9,8 +9,8 @@ import com.interplug.qcast.biz.master.dto.ApiTrestleDetailRequest;
 import com.interplug.qcast.biz.master.dto.ApiTrestleDetailResponse;
 import com.interplug.qcast.biz.master.dto.ApiTrestleRequest;
 import com.interplug.qcast.biz.master.dto.ApiTrestleResponse;
-import java.util.List;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -27,15 +27,15 @@ public interface MasterService {
   public ApiResponse<ApiModuleTpResponse> getModuleTypeItemList(
       @RequestParam("roofMatlCd") String roofMaterialCd);
   
-  // Q.CAST용 가대 목록 조회
+  // 가대 목록 조회
   @GetMapping("/trestle") 
-  public List<ApiTrestleResponse> getTrestleList(@RequestParam ApiTrestleRequest params);
+  public ApiResponse<ApiTrestleResponse> getTrestleList(@SpringQueryMap ApiTrestleRequest params);
 
-  // Q.CAST용 시공법 목록 조회
+  // 시공법 목록 조회
   @GetMapping("/construction")  
-  public List<ApiConstructionResponse> getConstructionList(@RequestParam ApiConstructionRequest params);
+  public ApiResponse<ApiConstructionResponse> getConstructionList(@SpringQueryMap ApiConstructionRequest params);
  
-  // Q.CAST용 가대 상세 조회
+  // 가대 상세 조회
   @GetMapping("/trestle/detail")  
-  public List<ApiTrestleDetailResponse> getConstructionDetailList(@RequestParam ApiTrestleDetailRequest params);
+  public ApiResponse<ApiTrestleDetailResponse> getTrestleDetailList(@SpringQueryMap ApiTrestleDetailRequest params);
 }