From d7f6c7a320885290b06fd27e15e4ea5977728af4 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Fri, 13 Dec 2024 17:40:28 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=20api=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=ED=8C=A8=ED=84=B4=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../displayItem/DisplayItemController.java | 4 +- .../qcast/biz/master/MasterController.java | 83 +++++++++++++++---- .../qcast/biz/master/MasterService.java | 45 ++++++++-- 3 files changed, 105 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java index 850c4fa6..f0b246b6 100644 --- a/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java +++ b/src/main/java/com/interplug/qcast/biz/displayItem/DisplayItemController.java @@ -49,7 +49,7 @@ public class DisplayItemController { @Operation(description = "제품 목록을 조회한다.") @GetMapping("/item-list") @ResponseStatus(HttpStatus.OK) - public List getItemList(@RequestParam("saleStoreId") String saleStoreId) + public List getItemList(@RequestParam String saleStoreId) throws Exception { return displayItemService.getItemList(saleStoreId); } @@ -64,7 +64,7 @@ public class DisplayItemController { @Operation(description = "제품 상세 정보를 조회한다.") @GetMapping("/item-detail") @ResponseStatus(HttpStatus.OK) - public ItemDetailResponse getItemDetail(@RequestParam("itemId") String itemId) throws Exception { + public ItemDetailResponse getItemDetail(@RequestParam String itemId) throws Exception { return displayItemService.getItemDetail(itemId); } } 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 ae347152..0eac1165 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -1,13 +1,10 @@ package com.interplug.qcast.biz.master; -import com.interplug.qcast.biz.master.dto.ApiConstructionRequest; import com.interplug.qcast.biz.master.dto.ApiConstructionResponse; import com.interplug.qcast.biz.master.dto.ApiModuleTpResponse; import com.interplug.qcast.biz.master.dto.ApiResponse; import com.interplug.qcast.biz.master.dto.ApiRoofMaterialResponse; -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 com.interplug.qcast.config.Exception.ErrorCode; import com.interplug.qcast.config.Exception.QcastException; @@ -15,7 +12,6 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -36,7 +32,7 @@ public class MasterController { @Operation(description = "모듈 타입별 아이템 목록을 조회한다.") @GetMapping("/getModuleTypeItemList") public ApiResponse getModuleTypeItemList( - @RequestParam("roofMatlCd") String roofMaterialCd) throws QcastException { + @RequestParam("roofMatlCd") String roofMaterialCd) throws QcastException { if (roofMaterialCd == null || roofMaterialCd.trim().isEmpty()) { throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); } @@ -45,25 +41,78 @@ public class MasterController { @Operation(description = "가대 목록 조회") @GetMapping("/getTrestleList") - public ApiResponse getTrestleList(@ModelAttribute ApiTrestleRequest params) { - System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getConstMthdCd()); - System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getModuleTpCd()); - System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getRaftBaseCd()); - System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getRoofBaseCd()); - System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getRoofMatlCd()); - System.out.println(" >>>>>>>>>>>>>>>>>>>>>>>>>> " + params.getTrestleMkrCd()); - return masterService.getTrestleList(params); + public ApiResponse getTrestleList( + @RequestParam(required = false) String moduleTpCd, + @RequestParam(required = false) String roofMatlCd, + @RequestParam(required = false) String raftBaseCd, + @RequestParam(required = false) String trestleMkrCd, + @RequestParam(required = false) String constMthdCd, + @RequestParam(required = false) String roofBaseCd) { + + return masterService.getTrestleList(moduleTpCd,roofMatlCd,raftBaseCd,trestleMkrCd,constMthdCd,roofBaseCd); } @Operation(description = "시공법 목록 조회") @GetMapping("/getConstructionList") - public ApiResponse getConstructionList(@ModelAttribute ApiConstructionRequest params) { - return masterService.getConstructionList(params); + public ApiResponse getConstructionList( + @RequestParam String moduleTpCd, + @RequestParam String roofMatlCd, + @RequestParam String trestleMkrCd, + @RequestParam String constMthdCd, + @RequestParam String roofBaseCd, + @RequestParam String illuminationTp, + @RequestParam String instHt, + @RequestParam String stdWindSpeed, + @RequestParam String stdSnowLd, + @RequestParam String inclCd, + @RequestParam(required = false) String raftBaseCd, + @RequestParam(required = false) Integer roofPitch) throws QcastException { + + if (moduleTpCd == null || moduleTpCd.trim().isEmpty() || + roofMatlCd == null || roofMatlCd.trim().isEmpty() || + trestleMkrCd == null || trestleMkrCd.trim().isEmpty() || + constMthdCd == null || constMthdCd.trim().isEmpty() || + roofBaseCd == null || roofBaseCd.trim().isEmpty() || + illuminationTp == null || illuminationTp.trim().isEmpty() || + instHt == null || instHt.trim().isEmpty() || + stdWindSpeed == null || stdWindSpeed.trim().isEmpty() || + stdSnowLd == null || stdSnowLd.trim().isEmpty() || + inclCd == null || inclCd.trim().isEmpty()) { + throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); + } + return masterService.getConstructionList(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp, instHt, stdWindSpeed, stdSnowLd, inclCd, raftBaseCd, roofPitch); } @Operation(description = "가대 상세 조회") @GetMapping("/getTrestleDetailList") - public ApiResponse getTrestleDetailList(@ModelAttribute ApiTrestleDetailRequest params) { - return masterService.getTrestleDetailList(params); + public ApiResponse getTrestleDetailList( + @RequestParam String moduleTpCd, + @RequestParam String roofMatlCd, + @RequestParam String trestleMkrCd, + @RequestParam String constMthdCd, + @RequestParam String roofBaseCd, + @RequestParam String illuminationTp, + @RequestParam String instHt, + @RequestParam String stdWindSpeed, + @RequestParam String stdSnowLd, + @RequestParam String inclCd, + @RequestParam String constTp, + @RequestParam(required = false) Integer mixMatlNo, + @RequestParam(required = false) Integer roofPitch) throws QcastException { + + if (moduleTpCd == null || moduleTpCd.trim().isEmpty() || + roofMatlCd == null || roofMatlCd.trim().isEmpty() || + trestleMkrCd == null || trestleMkrCd.trim().isEmpty() || + constMthdCd == null || constMthdCd.trim().isEmpty() || + roofBaseCd == null || roofBaseCd.trim().isEmpty() || + illuminationTp == null || illuminationTp.trim().isEmpty() || + instHt == null || instHt.trim().isEmpty() || + stdWindSpeed == null || stdWindSpeed.trim().isEmpty() || + stdSnowLd == null || stdSnowLd.trim().isEmpty() || + inclCd == null || inclCd.trim().isEmpty() || + constTp == null || constTp.trim().isEmpty()) { + throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); + } + return masterService.getTrestleDetailList(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp, instHt, stdWindSpeed, stdSnowLd, inclCd, constTp, mixMatlNo, roofPitch); } } 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 ec5c9957..1f1ee556 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java @@ -1,17 +1,14 @@ package com.interplug.qcast.biz.master; -import com.interplug.qcast.biz.master.dto.ApiConstructionRequest; import com.interplug.qcast.biz.master.dto.ApiConstructionResponse; import com.interplug.qcast.biz.master.dto.ApiModuleTpResponse; import com.interplug.qcast.biz.master.dto.ApiResponse; import com.interplug.qcast.biz.master.dto.ApiRoofMaterialResponse; -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 org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestParam; // @FeignClient(name = "master", url = "${feign.master.url}") @@ -28,14 +25,46 @@ public interface MasterService { @RequestParam("roofMatlCd") String roofMaterialCd); // 가대 목록 조회 - @GetMapping("/trestle") - public ApiResponse getTrestleList(@ModelAttribute ApiTrestleRequest params); + @GetMapping("/trestle") + public ApiResponse getTrestleList( + @RequestParam(required = false) String moduleTpCd, + @RequestParam(required = false) String roofMatlCd, + @RequestParam(required = false) String raftBaseCd, + @RequestParam(required = false) String trestleMkrCd, + @RequestParam(required = false) String constMthdCd, + @RequestParam(required = false) String roofBaseCd); // 시공법 목록 조회 @GetMapping("/construction") - public ApiResponse getConstructionList(@ModelAttribute ApiConstructionRequest params); + public ApiResponse getConstructionList( + @RequestParam String moduleTpCd, + @RequestParam String roofMatlCd, + @RequestParam String trestleMkrCd, + @RequestParam String constMthdCd, + @RequestParam String roofBaseCd, + @RequestParam String illuminationTp, + @RequestParam String instHt, + @RequestParam String stdWindSpeed, + @RequestParam String stdSnowLd, + @RequestParam String inclCd, + @RequestParam(required = false) String raftBaseCd, + @RequestParam(required = false) Integer roofPitch); // 가대 상세 조회 @GetMapping("/trestle/detail") - public ApiResponse getTrestleDetailList(@ModelAttribute ApiTrestleDetailRequest params); + public ApiResponse getTrestleDetailList( + @RequestParam String moduleTpCd, + @RequestParam String roofMatlCd, + @RequestParam String trestleMkrCd, + @RequestParam String constMthdCd, + @RequestParam String roofBaseCd, + @RequestParam String illuminationTp, + @RequestParam String instHt, + @RequestParam String stdWindSpeed, + @RequestParam String stdSnowLd, + @RequestParam String inclCd, + @RequestParam String constTp, + @RequestParam(required = false) Integer mixMatlNo, + @RequestParam(required = false) Integer roofPitch); + }