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 acf61ea5..54628a21 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java @@ -51,7 +51,7 @@ public interface MasterService { @RequestParam(required = false) Integer roofPitch); // 가대 상세 조회 - @GetMapping("/trestle/detail") + @GetMapping(value = "/trestle/detail", consumes = "application/json") public ApiResponse getTrestleDetailList( @RequestParam String moduleTpCd, @RequestParam String roofMatlCd, 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 index 53b8d206..d3499afc 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailModuleResponse.java @@ -9,25 +9,21 @@ import lombok.Setter; @Schema(description = "Api 가대 상세 모듈 조회 응답 객체") public class ApiTrestleDetailModuleResponse { - @Schema(description = "모듈타입코드(혼합제외)") - private String moduleTpCd; + @Schema(description = "모듈타입코드(혼합제외)") + private String moduleTpCd; - @Schema(description = "장경") - private double longAxis; + @Schema(description = "장경") + private Double longAxis; - @Schema(description = "단경") - private double shortAxis; + @Schema(description = "단경") + private Double shortAxis; - @Schema(description = "두께") - private double thickness; + @Schema(description = "두께") + private Double thickness; - @Schema(description = "색상") - private String color; - - @Schema(description = "모듈최대단수") - private Integer moduleMaxRows; - - @Schema(description = "순번") - private Integer priority; + @Schema(description = "색상") + private String color; + @Schema(description = "모듈최대단수") + private Integer moduleMaxRows; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackItemResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackItemResponse.java new file mode 100644 index 00000000..1d136c2c --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackItemResponse.java @@ -0,0 +1,35 @@ +package com.interplug.qcast.biz.master.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +@Schema(description = "Api 가대 상세 랙 아이템 응답 객체") +public class ApiTrestleDetailRackItemResponse { + + @Schema(description = "아이템ID") + private String itemId; + + @Schema(description = "랙단수코드") + private String rackRowsCd; + + @Schema(description = "랙길이") + private Double rackLen; + + @Schema(description = "스마트랙여부") + private String smartRackYn; + + @Schema(description = "랙지지금구수") + private Integer supFitQty; + + @Schema(description = "랙지지금구간격(랙양끝기준)") + private Double supFitIntvlPct; + + @Schema(description = "Api 가대 상세 스마트랙 응답 객체") + private List smartRack; +} 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 index 801b44cc..00f0c87c 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailRackResponse.java @@ -1,21 +1,38 @@ package com.interplug.qcast.biz.master.dto; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.Getter; import lombok.Setter; @Getter @Setter +@JsonIgnoreProperties(ignoreUnknown = true) @Schema(description = "Api 가대 상세 랙 조회 응답 객체") public class ApiTrestleDetailRackResponse { - @Schema(description = "모듈총단수") - private Integer moduleRows; + @Schema(description = "모듈타입코드") + private String moduleTpCd; - @Schema(description = "랙단수코드") - private String rackRowsCds; + @Schema(description = "모듈총단수") + private Integer moduleRows; - @Schema(description = "간격") - private String intvls; + @Schema(description = "모듈1단수") + private String moduleTpRows1; // private Integer moduleTpRows1; + @Schema(description = "모듈2단수") + private String moduleTpRows2; // private Integer moduleTpRows2; + + @Schema(description = "모듈3단수") + private String moduleTpRows3; // private Integer moduleTpRows3; + + @Schema(description = "모듈4단수") + private String moduleTpRows4; // private Integer moduleTpRows4; + + @Schema(description = "모듈5단수") + private String moduleTpRows5; // private Integer moduleTpRows5; + + @Schema(description = "랙목록") + private List racks; } 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 index 6e3de880..958d2810 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailResponse.java @@ -1,62 +1,66 @@ package com.interplug.qcast.biz.master.dto; -import java.util.List; - +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.Map; import lombok.Getter; import lombok.Setter; @Getter @Setter +@JsonIgnoreProperties(ignoreUnknown = true) @Schema(description = "Api 가대 상세 조회 응답 객체") public class ApiTrestleDetailResponse { - - @Schema(description = "랙여부") - private String rackYn; - @Schema(description = "치조가능여부") - private String plvrYn; + @Schema(description = "랙여부") + private String rackYn; - @Schema(description = "모듈최대단수") - private Integer moduleMaxRows; + @Schema(description = "치조가능여부") + private String plvrYn; - @Schema(description = "모듈최대열수") - private Integer moduleMaxCols; + @Schema(description = "모듈최대단수") + private Integer moduleMaxRows; - @Schema(description = "지붕기준모듈설치간격-처마") - private double eaveIntvl; + @Schema(description = "모듈최대열수") + private Integer moduleMaxCols; - @Schema(description = "지붕기준모듈설치간격-용마루") - private double ridgeIntvl; + @Schema(description = "지붕기준모듈설치간격-처마") + private Double eaveIntvl; - @Schema(description = "지붕기준모듈설치간격-케라바") - private double kerabaIntvl; + @Schema(description = "지붕기준모듈설치간격-용마루") + private Double ridgeIntvl; - @Schema(description = "모듈간간격-좌우") - private double moduleIntvlHor; + @Schema(description = "지붕기준모듈설치간격-케라바") + private Double kerabaIntvl; - @Schema(description = "모듈간간격-상하") - private double moduleIntvlVer; + @Schema(description = "모듈간간격-좌우") + private Double moduleIntvlHor; - @Schema(description = "치조배치 중단처마커버 설치가능여부") - private String cvrPlvrYn; + @Schema(description = "모듈간간격-상하") + private Double moduleIntvlVer; - @Schema(description = "랙리스지지금구수") - private double lessSupFitQty; + @Schema(description = "치조배치 중단처마커버 설치가능여부") + private String cvrPlvrYn; - @Schema(description = "랙리스지지금구간격(모듈모서리기준)") - private double lessSupFitIntvlPct; + @Schema(description = "랙리스지지금구수") + private Double lessSupFitQty; - @Schema(description = "랙구성수량(모듈1개당)") - private double rackQty; + @Schema(description = "랙리스지지금구간격(모듈모서리기준)") + private Double lessSupFitIntvlPct; - @Schema(description = "랙구성간격(모듈좌우면기준)") - private double rackIntvlPct; + @Schema(description = "랙구성수량(모듈1개당)") + private Double rackQty; - @Schema(description = "Api 가대 상세 모듈 조회 응답 객체") - private List module; + @Schema(description = "랙구성간격(모듈좌우면기준)") + private Double rackIntvlPct; - @Schema(description = "Api 가대 상세 랙 조회 응답 객체") - private List rack; + @Schema(description = "모듈낙설방지금구수") + private Double moduleSnowGdCnt; + @Schema(description = "Api 가대 상세 모듈 조회 응답 객체") + private List module; + + @Schema(description = "Api 가대 상세 랙 조회 응답 객체") + private Map rack; // = new HashMap<>(); } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailSmartRackResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailSmartRackResponse.java new file mode 100644 index 00000000..16f77156 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiTrestleDetailSmartRackResponse.java @@ -0,0 +1,25 @@ +package com.interplug.qcast.biz.master.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@JsonIgnoreProperties(ignoreUnknown = true) +@Schema(description = "Api 가대 상세 스마트랙 응답 객체") +public class ApiTrestleDetailSmartRackResponse { + + @Schema(description = "스마트랙순번") + private Integer seq; + + @Schema(description = "스마트랙유형코드(RACK:랙 길이, INTVL:랙 간격)") + private String setRackTpCd; + + @Schema(description = "스마트랙유형길이(RACK:랙 길이, INTVL:랙 간격)") + private Integer setRackTpLen; + + @Schema(description = "랙지지금구수") + private Integer supFitQty; +}