From 81f4ddbb9b2712bdae5e607918c101fd911a86e8 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Thu, 23 Jan 2025 13:55:36 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20PCS=20=EC=88=98=EB=8F=99=ED=9A=8C?= =?UTF-8?q?=EB=A1=9C=20=ED=99=95=EC=A0=95=20=EC=B2=B4=ED=81=AC=20api=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/master/MasterController.java | 8 +++++ .../qcast/biz/master/MasterService.java | 5 +++ ...rQtyResponse.java => ApiPcsSerQtyDto.java} | 8 ++--- ...e.java => ApiPcsSerQtyRoofSurfaceDto.java} | 8 ++--- ... => ApiPcsSerQtyRoofSurfaceModuleDto.java} | 9 +++-- .../ApiPcsMenualConfPcsItemRequest.java | 36 +++++++++++++++++++ .../menualconf/ApiPcsMenualConfRequest.java | 33 +++++++++++++++++ .../ApiPcsVoltageStepUpPcsItemResponse.java | 3 +- 8 files changed, 98 insertions(+), 12 deletions(-) rename src/main/java/com/interplug/qcast/biz/master/dto/pcs/{voltagestepup/ApiPcsVoltageStepUpSerQtyResponse.java => ApiPcsSerQtyDto.java} (66%) rename src/main/java/com/interplug/qcast/biz/master/dto/pcs/{voltagestepup/ApiPcsVoltageStepUpRoofSurfaceResponse.java => ApiPcsSerQtyRoofSurfaceDto.java} (66%) rename src/main/java/com/interplug/qcast/biz/master/dto/pcs/{voltagestepup/ApiPcsVoltageStepUpRoofSurfaceModuleResponse.java => ApiPcsSerQtyRoofSurfaceModuleDto.java} (51%) create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfPcsItemRequest.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfRequest.java 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 5fe2527a..6b1d6b49 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -6,6 +6,7 @@ import com.interplug.qcast.biz.master.dto.moduletype.ApiModuleTpResponse; import com.interplug.qcast.biz.master.dto.pcs.ApiPcsInfoRequest; import com.interplug.qcast.biz.master.dto.pcs.autorecommend.ApiPcsAutoRecommendResponse; import com.interplug.qcast.biz.master.dto.pcs.maker.ApiPcsMakerResponse; +import com.interplug.qcast.biz.master.dto.pcs.menualconf.ApiPcsMenualConfRequest; import com.interplug.qcast.biz.master.dto.pcs.series.ApiPcsSeriesItemRequest; import com.interplug.qcast.biz.master.dto.pcs.series.ApiPcsSeriesItemResponse; import com.interplug.qcast.biz.master.dto.pcs.voltagestepup.ApiPcsVoltageStepUpResponse; @@ -247,6 +248,13 @@ public class MasterController { return masterService.getPcsVoltageStepUpList(pcsVoltageStepUpRequest); } + @Operation(description = "PCS 수동회로 확정 체크한다.") + @PostMapping("/getPcsMenualConfChk") + public ApiResultResponse getPcsMenualConfChk( + @RequestBody ApiPcsMenualConfRequest pcsMenualConfChkRequest) { + return masterService.getPcsMenualConfChk(pcsMenualConfChkRequest).getResult(); + } + /** remote api group : quotation */ @Operation(description = "견적서 아이템을 조회한다.") @PostMapping("/getQuotationItem") 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 bf676258..d99d0199 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java @@ -7,6 +7,7 @@ import com.interplug.qcast.biz.master.dto.moduletype.ApiModuleTpResponse; import com.interplug.qcast.biz.master.dto.pcs.ApiPcsInfoRequest; import com.interplug.qcast.biz.master.dto.pcs.autorecommend.ApiPcsAutoRecommendResponse; import com.interplug.qcast.biz.master.dto.pcs.maker.ApiPcsMakerResponse; +import com.interplug.qcast.biz.master.dto.pcs.menualconf.ApiPcsMenualConfRequest; import com.interplug.qcast.biz.master.dto.pcs.series.ApiPcsSeriesItemRequest; import com.interplug.qcast.biz.master.dto.pcs.series.ApiPcsSeriesItemResponse; import com.interplug.qcast.biz.master.dto.pcs.voltagestepup.ApiPcsVoltageStepUpResponse; @@ -101,4 +102,8 @@ public interface MasterService { @PostMapping("/pcsVoltageStepUpList") public ApiResponse getPcsVoltageStepUpList( @RequestBody ApiPcsInfoRequest req); + + // PCS 수동회로 확정 체크 + @PostMapping("/pcsMenualConfChk") + public ApiResponse getPcsMenualConfChk(@RequestBody ApiPcsMenualConfRequest req); } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpSerQtyResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyDto.java similarity index 66% rename from src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpSerQtyResponse.java rename to src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyDto.java index 830acb5a..dbb8d2cc 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpSerQtyResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyDto.java @@ -1,4 +1,4 @@ -package com.interplug.qcast.biz.master.dto.pcs.voltagestepup; +package com.interplug.qcast.biz.master.dto.pcs; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -7,8 +7,8 @@ import lombok.Setter; @Getter @Setter -@Schema(description = "PCS 승압설정 정보 조회 직렬매수 응답 객체") -public class ApiPcsVoltageStepUpSerQtyResponse { +@Schema(description = "PCS 직렬매수 객체") +public class ApiPcsSerQtyDto { @Schema(description = "직렬매수", maxLength = 10) private Integer serQty; @@ -23,5 +23,5 @@ public class ApiPcsVoltageStepUpSerQtyResponse { private String usePossYn; @Schema(description = "지붕면 목록") - private List roofSurfaceList; + private List roofSurfaceList; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpRoofSurfaceResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java similarity index 66% rename from src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpRoofSurfaceResponse.java rename to src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java index 5fb96a99..0de685a5 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpRoofSurfaceResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceDto.java @@ -1,4 +1,4 @@ -package com.interplug.qcast.biz.master.dto.pcs.voltagestepup; +package com.interplug.qcast.biz.master.dto.pcs; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -7,8 +7,8 @@ import lombok.Setter; @Getter @Setter -@Schema(description = "PCS 승압설정 정보 조회 지붕면 응답 객체") -public class ApiPcsVoltageStepUpRoofSurfaceResponse { +@Schema(description = "PCS 직렬매수 지붕면 객체") +public class ApiPcsSerQtyRoofSurfaceDto { @Schema(description = "지붕면ID", maxLength = 50) private String roofSurfaceId; @@ -20,5 +20,5 @@ public class ApiPcsVoltageStepUpRoofSurfaceResponse { private Double roofSurfaceIncl; @Schema(description = "모듈아이템 List(도면에 설치된 모듈)") - private List moduleList; + private List moduleList; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpRoofSurfaceModuleResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceModuleDto.java similarity index 51% rename from src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpRoofSurfaceModuleResponse.java rename to src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceModuleDto.java index d2c25095..c2eb89d1 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpRoofSurfaceModuleResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsSerQtyRoofSurfaceModuleDto.java @@ -1,4 +1,4 @@ -package com.interplug.qcast.biz.master.dto.pcs.voltagestepup; +package com.interplug.qcast.biz.master.dto.pcs; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; @@ -6,12 +6,15 @@ import lombok.Setter; @Getter @Setter -@Schema(description = "PCS 승압설정 정보 조회 모듈아이템 List(도면에 설치된 모듈) 응답 객체") -public class ApiPcsVoltageStepUpRoofSurfaceModuleResponse { +@Schema(description = "PCS 직렬매수 지붕면 모듈아이템 List(도면에 설치된 모듈) 객체") +public class ApiPcsSerQtyRoofSurfaceModuleDto { @Schema(description = "제품ID", maxLength = 20) private String itemId; @Schema(description = "회로구성번호((1-1,1-1,1-2,1-2,2-1,2-2.....))", maxLength = 10) private String circuit; + + @Schema(description = "PCS 아이템ID", maxLength = 20) + private String pcsItemId; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfPcsItemRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfPcsItemRequest.java new file mode 100644 index 00000000..c2fd3ff4 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfPcsItemRequest.java @@ -0,0 +1,36 @@ +package com.interplug.qcast.biz.master.dto.pcs.menualconf; + +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsSerQtyDto; +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 = "PCS 수동회로 확정 체크 PCS 아이템 목록 요청 객체") +public class ApiPcsMenualConfPcsItemRequest { + @Schema(description = "PCS메이커코드", maxLength = 10) + @NotNull + private String pcsMkrCd; + + @Schema(description = "PCS시리즈코드", maxLength = 10) + @NotNull + private String pcsSerCd; + + @Schema(description = "PCS제품ID", maxLength = 20) + @NotNull + private String itemId; + + @Schema(description = "PCS제품명", maxLength = 100) + @NotNull + private String itemNm; + + @Schema(description = "PCS 제품명(Basic Material)", maxLength = 40) + @NotNull + private String goodsNo; + + @Schema(description = "직렬매수 목록") + private List serQtyList; +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfRequest.java new file mode 100644 index 00000000..79d5a446 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/menualconf/ApiPcsMenualConfRequest.java @@ -0,0 +1,33 @@ +package com.interplug.qcast.biz.master.dto.pcs.menualconf; + +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsModuleItemRequest; +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 = "PCS 수동회로 확정 체크 요청 객체") +public class ApiPcsMenualConfRequest { + @Schema(description = "Max접속(과적)여부") + @NotNull + public String maxConnYn; + + @Schema(description = "동일회로도여부") + @NotNull + public String smpCirYn; + + @Schema(description = "한랭지여부") + @NotNull + public String coldZoneYn; + + @Schema(description = "사용된 모듈아이템 List") + @NotNull + public List useModuleItemList; + + @Schema(description = "PCS 아이템 목록") + @NotNull + public List pcsItemList; +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpPcsItemResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpPcsItemResponse.java index a392bf83..d0617bf8 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpPcsItemResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpPcsItemResponse.java @@ -1,5 +1,6 @@ package com.interplug.qcast.biz.master.dto.pcs.voltagestepup; +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsSerQtyDto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import lombok.Getter; @@ -29,7 +30,7 @@ public class ApiPcsVoltageStepUpPcsItemResponse { private String circuitCfg; @Schema(description = "직렬매수 목록") - private List serQtyList; + private List serQtyList; @Schema(description = "연결함목록") private List connList;