From 5993c28e55873afae35ce7102a89c800c73ac593 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Thu, 23 Jan 2025 15:37:34 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20PCS=20=EC=A0=91=EC=86=8D=ED=95=A8=20?= =?UTF-8?q?=EB=B0=8F=20=EC=98=B5=EC=85=98=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20api=20=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 | 9 ++++++ .../qcast/biz/master/MasterService.java | 7 +++++ ...nResponse.java => ApiPcsConnResponse.java} | 6 ++-- ...esponse.java => ApiPcsOptionResponse.java} | 6 ++-- .../ApiPcsConnOptionPcsItemResponse.java | 31 +++++++++++++++++++ .../connoption/ApiPcsConnOptionRequest.java | 22 +++++++++++++ .../connoption/ApiPcsConnOptionResponse.java | 21 +++++++++++++ .../ApiPcsVoltageStepUpPcsItemResponse.java | 3 +- .../ApiPcsVoltageStepUpResponse.java | 3 +- 9 files changed, 100 insertions(+), 8 deletions(-) rename src/main/java/com/interplug/qcast/biz/master/dto/pcs/{voltagestepup/ApiPcsVoltageStepUpConnResponse.java => ApiPcsConnResponse.java} (76%) rename src/main/java/com/interplug/qcast/biz/master/dto/pcs/{voltagestepup/ApiPcsVoltageStepUpOptionResponse.java => ApiPcsOptionResponse.java} (65%) create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionPcsItemResponse.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionRequest.java create mode 100644 src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionResponse.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 6b1d6b49..735a82ac 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -5,6 +5,8 @@ import com.interplug.qcast.biz.master.dto.construction.ApiConstructionResponse; 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.connoption.ApiPcsConnOptionRequest; +import com.interplug.qcast.biz.master.dto.pcs.connoption.ApiPcsConnOptionResponse; 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; @@ -255,6 +257,13 @@ public class MasterController { return masterService.getPcsMenualConfChk(pcsMenualConfChkRequest).getResult(); } + @Operation(description = "PCS 접속함 및 옵션 목록을 조회한다.") + @PostMapping("/getPcsConnOptionItemList") + public ApiResponse getPcsConnOptionItemList( + @RequestBody ApiPcsConnOptionRequest pcsConnOptionRequest) { + return masterService.getPcsConnOptionItemList(pcsConnOptionRequest); + } + /** 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 d99d0199..91fcaab4 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java @@ -6,6 +6,8 @@ import com.interplug.qcast.biz.master.dto.construction.ApiConstructionResponse; 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.connoption.ApiPcsConnOptionRequest; +import com.interplug.qcast.biz.master.dto.pcs.connoption.ApiPcsConnOptionResponse; 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; @@ -106,4 +108,9 @@ public interface MasterService { // PCS 수동회로 확정 체크 @PostMapping("/pcsMenualConfChk") public ApiResponse getPcsMenualConfChk(@RequestBody ApiPcsMenualConfRequest req); + + // PCS 접속함 및 옵션 목록 조회 + @PostMapping("/pcsConnOptionItemList") + public ApiResponse getPcsConnOptionItemList( + @RequestBody ApiPcsConnOptionRequest req); } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpConnResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsConnResponse.java similarity index 76% rename from src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpConnResponse.java rename to src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsConnResponse.java index 6561961a..1bf6579f 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpConnResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsConnResponse.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,8 +6,8 @@ import lombok.Setter; @Getter @Setter -@Schema(description = "PCS 승압설정 정보 조회 연결함목록 응답 객체") -public class ApiPcsVoltageStepUpConnResponse { +@Schema(description = "PCS 연결함목록 응답 객체") +public class ApiPcsConnResponse { @Schema(description = "제품ID", maxLength = 20) private String itemId; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpOptionResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsOptionResponse.java similarity index 65% rename from src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpOptionResponse.java rename to src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsOptionResponse.java index 876c98a6..31859262 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpOptionResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/ApiPcsOptionResponse.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,8 +6,8 @@ import lombok.Setter; @Getter @Setter -@Schema(description = "PCS 승압설정 정보 조회 옵션목록(모니터선택) 응답 객체") -public class ApiPcsVoltageStepUpOptionResponse { +@Schema(description = "PCS 옵션목록(모니터선택) 응답 객체") +public class ApiPcsOptionResponse { @Schema(description = "PCS옵션코드", maxLength = 10) private String pcsOptCd; diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionPcsItemResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionPcsItemResponse.java new file mode 100644 index 00000000..f324fda5 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionPcsItemResponse.java @@ -0,0 +1,31 @@ +package com.interplug.qcast.biz.master.dto.pcs.connoption; + +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsConnResponse; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "PCS 접속함 및 옵션 목록 조회 PCS 아이템 응답 객체") +public class ApiPcsConnOptionPcsItemResponse { + + @Schema(description = "PCS메이커코드", maxLength = 10) + private String pcsMkrCd; + + @Schema(description = "PCS시리즈코드", maxLength = 10) + private String pcsSerCd; + + @Schema(description = "PCS 아이템ID", maxLength = 20) + private String itemId; + + @Schema(description = "PCS 제품명", maxLength = 100) + private String itemNm; + + @Schema(description = "PCS 제품명(Basic Material)", maxLength = 100) + private String goodsNo; + + @Schema(description = "연결함목록") + private List connList; +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionRequest.java new file mode 100644 index 00000000..54e4b398 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionRequest.java @@ -0,0 +1,22 @@ +package com.interplug.qcast.biz.master.dto.pcs.connoption; + +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsItemRequest; +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 ApiPcsConnOptionRequest { + @Schema(description = "사용된 모듈아이템 List") + @NotNull + public List useModuleItemList; + + @Schema(description = "PCS아이템ID") + @NotNull + public List pcsItemList; +} diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionResponse.java new file mode 100644 index 00000000..c49702d5 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/connoption/ApiPcsConnOptionResponse.java @@ -0,0 +1,21 @@ +package com.interplug.qcast.biz.master.dto.pcs.connoption; + +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsOptionResponse; +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 ApiPcsConnOptionResponse { + @Schema(description = "PCS 아이템 목록") + @NotNull + public List pcsItemList; + + @Schema(description = "옵션목록(모니터선택)") + @NotNull + public List optionList; +} 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 7eb9d596..e5670be1 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.ApiPcsConnResponse; import com.interplug.qcast.biz.master.dto.pcs.ApiPcsSerQtyDto; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; @@ -30,5 +31,5 @@ public class ApiPcsVoltageStepUpPcsItemResponse { private List serQtyList; @Schema(description = "연결함목록") - private List connList; + private List connList; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpResponse.java index b89ae874..c0036cff 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/pcs/voltagestepup/ApiPcsVoltageStepUpResponse.java @@ -1,5 +1,6 @@ package com.interplug.qcast.biz.master.dto.pcs.voltagestepup; +import com.interplug.qcast.biz.master.dto.pcs.ApiPcsOptionResponse; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; import lombok.Getter; @@ -14,5 +15,5 @@ public class ApiPcsVoltageStepUpResponse { private List pcsItemList; @Schema(description = "옵션목록(모니터선택)") - private List optionList; + private List optionList; }