From 9f03c9adb8bc3748159968cf422ed899c3eaae46 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Tue, 10 Dec 2024 18:55:29 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=B0=EC=B9=98=20API=20req/res=20=EC=8B=A0?= =?UTF-8?q?=EA=B7=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvasSetting/CanvasSettingService.java | 3 - .../qcast/biz/master/MasterController.java | 31 ++++++++- .../qcast/biz/master/MasterService.java | 20 ++++++ .../master/dto/ApiConstructionRequest.java | 51 +++++++++++++++ .../master/dto/ApiConstructionResponse.java | 36 +++++++++++ .../dto/ApiTrestleDetailModuleResponse.java | 33 ++++++++++ .../dto/ApiTrestleDetailRackResponse.java | 21 +++++++ .../master/dto/ApiTrestleDetailRequest.java | 51 +++++++++++++++ .../master/dto/ApiTrestleDetailResponse.java | 62 ++++++++++++++++++ .../biz/master/dto/ApiTrestleRequest.java | 30 +++++++++ .../biz/master/dto/ApiTrestleResponse.java | 63 +++++++++++++++++++ 11 files changed, 397 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleRequest.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java index ccc613cf..40f4505b 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java @@ -22,7 +22,6 @@ public class CanvasSettingService { } // Canvas Setting 등록 - @SuppressWarnings("static-access") public Map insertCanvasSetting(CanvasSettingInfo csi) throws QcastException { Map response = new HashMap<>(); @@ -36,8 +35,6 @@ public class CanvasSettingService { // 먼저 데이터가 존재하는지 확인 CanvasSettingInfo cntData = canvasSettingMapper.getCanvasSettingCnt(csi.getObjectNo()); - System.out.println("dssdsssdsdsds cnt : " + cntData.getCnt().intValue()); - // 데이터가 존재하지 않으면 insert if (cntData.getCnt().intValue() < 1) { canvasSettingMapper.insertCanvasSetting(csi); 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 24b4c911..90b367ba 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -3,11 +3,22 @@ package com.interplug.qcast.biz.master; 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.ApiTrestleRequest; +import com.interplug.qcast.biz.master.dto.ApiTrestleResponse; +import com.interplug.qcast.biz.master.dto.ApiConstructionRequest; +import com.interplug.qcast.biz.master.dto.ApiConstructionResponse; +import com.interplug.qcast.biz.master.dto.ApiTrestleDetailRequest; +import com.interplug.qcast.biz.master.dto.ApiTrestleDetailResponse; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; + +import java.util.List; 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; @@ -30,4 +41,22 @@ public class MasterController { @PathVariable("roofMaterialCd") String roofMaterialCd) { return masterService.getModuleTypeItemList(roofMaterialCd); } -} + + @Operation(description = "Q.CAST용 가대 목록 조회") + @PostMapping("/getTrestleList") + public List getTrestleList(@RequestBody ApiTrestleRequest params) { + return masterService.getTrestleList(params); + } + + @Operation(description = "Q.CAST용 시공법 목록 조회") + @PostMapping("/getConstructionList") + public List getConstructionList(@RequestBody ApiConstructionRequest params) { + return masterService.getConstructionList(params); + } + + @Operation(description = "Q.CAST용 가대 상세 조회") + @PostMapping("/getConstructionDetailList") + public List getConstructionDetailList(@RequestBody ApiTrestleDetailRequest params) { + return masterService.getConstructionDetailList(params); + } +} \ No newline at end of file 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 d6fa0a9c..d2d7555a 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java @@ -3,9 +3,17 @@ package com.interplug.qcast.biz.master; 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 java.util.List; + import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import com.interplug.qcast.biz.master.dto.ApiTrestleRequest; +import com.interplug.qcast.biz.master.dto.ApiTrestleResponse; +import com.interplug.qcast.biz.master.dto.ApiConstructionRequest; +import com.interplug.qcast.biz.master.dto.ApiConstructionResponse; +import com.interplug.qcast.biz.master.dto.ApiTrestleDetailRequest; +import com.interplug.qcast.biz.master.dto.ApiTrestleDetailResponse; // @FeignClient(name = "master", url = "${feign.master.url}") @FeignClient(name = "master", url = "${qsp.url}/api/master") @@ -19,4 +27,16 @@ public interface MasterService { @GetMapping("/moduleTypeItemList") public ApiResponse getModuleTypeItemList( @RequestParam("roofMaterialCd") String roofMaterialCd); + + // Q.CAST용 가대 목록 조회 + @GetMapping("/trestle") + public List getTrestleList(@RequestParam ApiTrestleRequest params); + + // Q.CAST용 시공법 목록 조회 + @GetMapping("/construction") + public List getConstructionList(@RequestParam ApiConstructionRequest params); + + // Q.CAST용 가대 상세 조회 + @GetMapping("/trestle/detail") + public List getConstructionDetailList(@RequestParam ApiTrestleDetailRequest params); } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java new file mode 100644 index 00000000..f5598736 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionRequest.java @@ -0,0 +1,51 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiConstructionReq", description = "Api 시공법 목록 조회 요청 객체") +public class ApiConstructionRequest { + + /** Language Code */ + private String langCd; + + /** Module Type Code */ + private String moduleTpCd; + + /** Roofing Material Code */ + private String roofMatlCd; + + /** Trestle Maker Code */ + private String trestleMkrCd; + + /** Construction Method Code */ + private String constMthdCd; + + /** Roof Base Code */ + private String roofBaseCd; + + /** Illumination Type */ + private String illuminationTp; + + /** Installation Height */ + private String instHt; + + /** Standard Wind Speed */ + private String stdWindSpeed; + + /** Standard Snow Load */ + private String stdSnowLd; + + /** Incline Code */ + private String inclCd; + + /** Rafter Base Code */ + private String raftBaseCd; + + /** Roof Pitch */ + private int roofPitch; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java new file mode 100644 index 00000000..c71184d9 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiConstructionResponse.java @@ -0,0 +1,36 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiConstructionRes", description = "Api 시공법 목록 조회 응답 객체") +public class ApiConstructionResponse { + + /** Construction Type */ + private String constTp; + + /** Construction Type Name */ + private String constTpNm; + + /** Construction Type Japan */ + private String constTpJp; + + /** Construction Possible Yn */ + private String constPossYn; + + /** Plover Possible Yn */ + private String plvrYn; + + /** Coverable Installation Possible Yn */ + private String cvrYn; + + /** Cover Limit Rows Single */ + private int cvrLmtRow; + + /** Snow Guard Installation Possible Yn */ + private String snowGdPossYn; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java new file mode 100644 index 00000000..a0870821 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java @@ -0,0 +1,33 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiTrestleDetailModuleRes", description = "Api 가대 상세 모듈 조회 응답 객체") +public class ApiTrestleDetailModuleResponse { + + /** Module Type Code */ + private String moduleTpCd; + + /** Long Axis mm */ + private double longAxis; + + /** Short Axis1 mm */ + private double shortAxis; + + /** Thickness */ + private double thickness; + + /** Color */ + private String color; + + /** Module Max Rows */ + private int moduleMaxRows; + + /** Sort Order */ + private int priority; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java new file mode 100644 index 00000000..6111a283 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java @@ -0,0 +1,21 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiTrestleDetailRackRes", description = "Api 가대 상세 랙 조회 응답 객체") +public class ApiTrestleDetailRackResponse { + + /** Module Rows */ + private int moduleRows; + + /** Rack Rows Codes */ + private String rackRowsCds; + + /** Intervals */ + private String intvls; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java new file mode 100644 index 00000000..4a27cb10 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRequest.java @@ -0,0 +1,51 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiTrestleDetailReq", description = "Api 가대 상세 조회 요청 객체") +public class ApiTrestleDetailRequest { + + /** Language Code */ + private String langCd; + + /** Module Type Code */ + private String moduleTpCd; + + /** Roofing Material Code */ + private String roofMatlCd; + + /** Trestle Maker Code */ + private String trestleMkrCd; + + /** Construction Method Code */ + private String constMthdCd; + + /** Roof Base Code */ + private String roofBaseCd; + + /** Illumination Type */ + private String illuminationTp; + + /** Installation Height */ + private String instHt; + + /** Standard Wind Speed */ + private String stdWindSpeed; + + /** Standard Snow Load */ + private String stdSnowLd; + + /** Incline Code */ + private String inclCd; + + /** Construction Type */ + private String constTp; + + /** Mix Meterial No */ + private int mixMatlNo; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java new file mode 100644 index 00000000..ff98771e --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java @@ -0,0 +1,62 @@ +package com.interplug.qcast.biz.master.dto; + +import java.util.List; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiTrestleDetailRes", description = "Api 가대 상세 조회 응답 객체") +public class ApiTrestleDetailResponse { + + /** Rack Yn */ + private String rackYn; + + /** Plover Possible Yn */ + private String plvrYn; + + /** Module Max Rows */ + private int moduleMaxRows; + + /** Module Max Columns */ + private int moduleMaxCols; + + /** Eave Interval */ + private double eaveIntvl; + + /** Ridge Interval */ + private double ridgeIntvl; + + /** Keraba Interval */ + private double kerabaIntvl; + + /** Module Interval Horizontal */ + private double moduleIntvlHor; + + /** Module Interval Vertical */ + private double moduleIntvlVer; + + /** Cover Plover Possible Yn */ + private String cvrPlvrYn; + + /** Less Support Fittings Qty */ + private double lessSupFitQty; + + /** Less Support Fittings Interval Percent */ + private double lessSupFitIntvlPct; + + /** Rack Qty */ + private double rackQty; + + /** Rack Interval Percent */ + private double rackIntvlPct; + + /** Module List */ + private List module; + + /** Rack List */ + private List rack; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleRequest.java new file mode 100644 index 00000000..67af00a2 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleRequest.java @@ -0,0 +1,30 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiTrestleReq", description = "Api 가대 목록 조회 요청 객체") +public class ApiTrestleRequest { + + /** Module Type Code */ + private String moduleTpCd; + + /** Roofing Material Code */ + private String roofMatlCd; + + /** Rafter Base Code */ + private String raftBaseCd; + + /** Trestle Maker Code */ + private String trestleMkrCd; + + /** Construction Method Code */ + private String constMthdCd; + + /** Roof Base Code */ + private String roofBaseCd; + +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java new file mode 100644 index 00000000..4d446d91 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleResponse.java @@ -0,0 +1,63 @@ +package com.interplug.qcast.biz.master.dto; + +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Tag(name = "ApiTrestleRes", description = "Api 가대 목록 조회 응답 객체") +public class ApiTrestleResponse { + + /** Module Type Code */ + private String moduleTpCd; + + /** Module Type Code Name */ + private String moduleTpCdNm; + + /** Module Type Code Japan */ + private String moduleTpCdJp; + + /** Roofing Material Code */ + private String roofMatlCd; + + /** Roofing Material Code Name */ + private String roofMatlCdNm; + + /** Roofing Material Code Japan */ + private String roofMatlCdJp; + + /** Trestle Maker Code */ + private String trestleMkrCd; + + /** Trestle Maker Code Name */ + private String trestleMkrCdNm; + + /** Trestle Maker Code Japan */ + private String trestleMkrCdJp; + + /** Construction Method Code */ + private String constMthdCd; + + /** Construction Method Code Name */ + private String constMthdCdNm; + + /** Construction Method Code Japan */ + private String constMthdCdJp; + + /** Roof Base Code */ + private String roofBaseCd; + + /** Roof Base Code Name */ + private String roofBaseCdNm; + + /** Roof Base Code Japan */ + private String roofBaseCdJp; + + /** Rack Yn */ + private String rackYn; + + /** Sort Order */ + private int priority; + +}