From 29271aab13f01f4af7f8f5ef8e8a0f5c4089cd1f Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Mon, 3 Feb 2025 15:02:15 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=EA=B2=AC=EC=A0=81=EC=84=9C=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=A1=B0=ED=9A=8C=20api=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=8C=80=EC=9D=91=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiQuotationItemPcsConnectionRequest.java | 16 ++ .../quotation/ApiQuotationItemPcsRequest.java | 5 + .../quotation/ApiQuotationItemRequest.java | 135 +--------------- .../ApiQuotationItemTrestleRequest.java | 146 ++++++++++++++++++ 4 files changed, 170 insertions(+), 132 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsConnectionRequest.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemTrestleRequest.java diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsConnectionRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsConnectionRequest.java new file mode 100644 index 00000000..2ada92b2 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsConnectionRequest.java @@ -0,0 +1,16 @@ +package com.interplug.qcast.biz.master.dto.quotation; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "Api 견적서 아이템 조회 PCS 연결함 요청 객체") +public class ApiQuotationItemPcsConnectionRequest { + + @Schema(description = "연결함(접속함)아이템ID") + @NotNull + public String connItemId; +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsRequest.java index e8a74fdd..d41bd1fb 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemPcsRequest.java @@ -2,6 +2,7 @@ package com.interplug.qcast.biz.master.dto.quotation; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; +import java.util.List; import lombok.Getter; import lombok.Setter; @@ -29,4 +30,8 @@ public class ApiQuotationItemPcsRequest { @Schema(description = "병렬수(회로수)") @NotNull public Integer paralQty; + + @Schema(description = "연결함(접속함)목록") + @NotNull + public List connections; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java index bc6c494a..3e0ddb84 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemRequest.java @@ -11,140 +11,11 @@ import lombok.Setter; @Schema(description = "Api 견적서 아이템 조회 요청 객체") public class ApiQuotationItemRequest { - @Schema(description = "모듈타입코드") + @Schema(description = "가대 목록") @NotNull - public String moduleTpCd; + public List trestles; - @Schema(description = "지붕재코드") - @NotNull - public String roofMatlCd; - - @Schema(description = "가대메이커코드") - @NotNull - public String trestleMkrCd; - - @Schema(description = "공법코드") - @NotNull - public String constMthdCd; - - @Schema(description = "지붕기초코드") - @NotNull - public String roofBaseCd; - - @Schema(description = "면조도") - @NotNull - public String illuminationTp; - - @Schema(description = "설치높이") - @NotNull - public String instHt; - - @Schema(description = "풍속") - @NotNull - public String stdWindSpeed; - - @Schema(description = "적설량") - @NotNull - public Integer stdSnowLd; - - @Schema(description = "경사도코드") - @NotNull - public String inclCd; - - @Schema(description = "시공법") - @NotNull - public String constTp; - - @Schema(description = "혼합모듈번호") - public Integer mixMatlNo; - - @Schema(description = "서까래기초코드") - public String raftBaseCd; - - @Schema(description = "하제(망둥어)피치") - public Integer roofPitch; - - @Schema(description = "처마커버설치여부") - @NotNull - public String cvrYn; - - @Schema(description = "낙설방지금구설치여부") - @NotNull - public String snowGdYn; - - @Schema(description = "치조배치여부") - @NotNull - public String plvrYn; - - @Schema(description = "모듈 총 수") - @NotNull - public Integer moduleTotCnt; - - @Schema(description = "모듈 총 단 수") - @NotNull - public Integer moduleRowsTotCnt; - - @Schema(description = "노출 하면 총 수") - @NotNull - public Integer exposedBottomTotCnt; - - @Schema(description = "노출 반 하면 총 수") - @NotNull - public Integer exposedHalfBottomTotCnt; - - @Schema(description = "노출 최 하면 총 수") - @NotNull - public Integer exposedLowerBottomTotCnt; - - @Schema(description = "노출 상면 총 수") - @NotNull - public Integer exposedTopTotCnt; - - @Schema(description = "노출 반 상면 총 수") - @NotNull - public Integer exposedHalfTopTotCnt; - - @Schema(description = "접면 총 수") - @NotNull - public Integer touchedSurfaceTotCnt; - - @Schema(description = "반 접면 총 수") - @NotNull - public Integer touchedHalfSurfaceTotCnt; - - @Schema(description = "처마커버 총 수") - @NotNull - public Integer eavesTotCnt; - - @Schema(description = "반 처마커버 총 수") - @NotNull - public Integer eavesHalfTotCnt; - - @Schema(description = "모듈") - @NotNull - public List modules; - - @Schema(description = "모듈 단 정보") - @NotNull - public List moduleRows; - - @Schema(description = "랙 사용 여부") - @NotNull - public String rackYn; - - @Schema(description = "랙 총 수") - @NotNull - public Integer rackTotCnt; - - @Schema(description = "랙 지지금구 총 수") - @NotNull - public Integer rackFittingTotCnt; - - @Schema(description = "랙") - @NotNull - public List racks; - - @Schema(description = "PCS") + @Schema(description = "PCS 목록") @NotNull public List pcses; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemTrestleRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemTrestleRequest.java new file mode 100644 index 00000000..da205b30 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/quotation/ApiQuotationItemTrestleRequest.java @@ -0,0 +1,146 @@ +package com.interplug.qcast.biz.master.dto.quotation; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "Api 견적서 아이템 조회 가대 요청 객체") +public class ApiQuotationItemTrestleRequest { + + @Schema(description = "모듈타입코드") + @NotNull + public String moduleTpCd; + + @Schema(description = "지붕재코드") + @NotNull + public String roofMatlCd; + + @Schema(description = "가대메이커코드") + @NotNull + public String trestleMkrCd; + + @Schema(description = "공법코드") + @NotNull + public String constMthdCd; + + @Schema(description = "지붕기초코드") + @NotNull + public String roofBaseCd; + + @Schema(description = "면조도") + @NotNull + public String illuminationTp; + + @Schema(description = "설치높이") + @NotNull + public String instHt; + + @Schema(description = "풍속") + @NotNull + public String stdWindSpeed; + + @Schema(description = "적설량") + @NotNull + public Integer stdSnowLd; + + @Schema(description = "경사도코드") + @NotNull + public String inclCd; + + @Schema(description = "시공법") + @NotNull + public String constTp; + + @Schema(description = "혼합모듈번호") + public Integer mixMatlNo; + + @Schema(description = "서까래기초코드") + public String raftBaseCd; + + @Schema(description = "하제(망둥어)피치") + public Integer roofPitch; + + @Schema(description = "처마커버설치여부") + @NotNull + public String cvrYn; + + @Schema(description = "낙설방지금구설치여부") + @NotNull + public String snowGdYn; + + @Schema(description = "치조배치여부") + @NotNull + public String plvrYn; + + @Schema(description = "모듈 총 수") + @NotNull + public Integer moduleTotCnt; + + @Schema(description = "모듈 총 단 수") + @NotNull + public Integer moduleRowsTotCnt; + + @Schema(description = "노출 하면 총 수") + @NotNull + public Integer exposedBottomTotCnt; + + @Schema(description = "노출 반 하면 총 수") + @NotNull + public Integer exposedHalfBottomTotCnt; + + @Schema(description = "노출 최 하면 총 수") + @NotNull + public Integer exposedLowerBottomTotCnt; + + @Schema(description = "노출 상면 총 수") + @NotNull + public Integer exposedTopTotCnt; + + @Schema(description = "노출 반 상면 총 수") + @NotNull + public Integer exposedHalfTopTotCnt; + + @Schema(description = "접면 총 수") + @NotNull + public Integer touchedSurfaceTotCnt; + + @Schema(description = "반 접면 총 수") + @NotNull + public Integer touchedHalfSurfaceTotCnt; + + @Schema(description = "처마커버 총 수") + @NotNull + public Integer eavesTotCnt; + + @Schema(description = "반 처마커버 총 수") + @NotNull + public Integer eavesHalfTotCnt; + + @Schema(description = "모듈") + @NotNull + public List modules; + + @Schema(description = "모듈 단 정보") + @NotNull + public List moduleRows; + + @Schema(description = "랙 사용 여부") + @NotNull + public String rackYn; + + @Schema(description = "랙 총 수") + @NotNull + public Integer rackTotCnt; + + @Schema(description = "랙 지지금구 총 수") + @NotNull + public Integer rackFittingTotCnt; + + @Schema(description = "랙") + @NotNull + public List racks; +}