From b5c795486e7bcb62ff06c0f796991c0dd6027814 Mon Sep 17 00:00:00 2001 From: lelalela Date: Mon, 13 Jan 2025 22:23:32 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EA=B0=80=EB=8C=80=20=EC=83=81=EC=84=B8=20a?= =?UTF-8?q?pi=EC=97=90=20roofindex=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 | 38 +++++++++++-------- .../detail/ApiTrestleDetailRequest.java | 3 ++ .../detail/ApiTrestleDetailResponse.java | 3 ++ 3 files changed, 28 insertions(+), 16 deletions(-) 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 bcdc17a2..34283b6b 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -180,22 +180,28 @@ public class MasterController { @RequestBody List reqList) { ArrayList> results = new ArrayList<>(); for (ApiTrestleDetailRequest req : reqList) { - ApiResponse result = - masterService.getTrestleDetailList( - req.getModuleTpCd(), - req.getRoofMatlCd(), - req.getTrestleMkrCd(), - req.getConstMthdCd(), - req.getRoofBaseCd(), - req.getIlluminationTp(), - req.getInstHt(), - req.getStdWindSpeed(), - req.getStdSnowLd(), - req.getInclCd(), - req.getConstTp(), - req.getMixMatlNo(), - req.getRoofPitch()); - results.add(result); + ApiTrestleDetailResponse result = + masterService + .getTrestleDetailList( + req.getModuleTpCd(), + req.getRoofMatlCd(), + req.getTrestleMkrCd(), + req.getConstMthdCd(), + req.getRoofBaseCd(), + req.getIlluminationTp(), + req.getInstHt(), + req.getStdWindSpeed(), + req.getStdSnowLd(), + req.getInclCd(), + req.getConstTp(), + req.getMixMatlNo(), + req.getRoofPitch()) + .getData(); + result.setRoofIndex(req.getRoofIndex()); + + ApiResponse response = new ApiResponse<>(); + response.setData(result); + results.add(response); } return results; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailRequest.java b/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailRequest.java index f0776ce2..a9043cdf 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailRequest.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailRequest.java @@ -59,4 +59,7 @@ public class ApiTrestleDetailRequest { @Schema(description = "하제(망둥어)피치") private Integer roofPitch; + + @Schema(description = "지붕index 번호") + private String roofIndex; } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailResponse.java index 5f6dbbc2..014e9a89 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/trestle/detail/ApiTrestleDetailResponse.java @@ -13,6 +13,9 @@ import lombok.Setter; @Schema(description = "Api 가대 상세 조회 응답 객체") public class ApiTrestleDetailResponse { + @Schema(description = "지붕index") + private String roofIndex; + @Schema(description = "랙여부") private String rackYn; From 1d84e6d206488560e72bbdee71856e5e1724e849 Mon Sep 17 00:00:00 2001 From: lelalela Date: Mon, 13 Jan 2025 22:39:04 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EA=B0=80=EB=8C=80=20=EC=83=81=EC=84=B8=20a?= =?UTF-8?q?pi=20=EC=88=98=EC=A0=952222?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/master/MasterController.java | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) 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 34283b6b..f7259c98 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -180,28 +180,31 @@ public class MasterController { @RequestBody List reqList) { ArrayList> results = new ArrayList<>(); for (ApiTrestleDetailRequest req : reqList) { - ApiTrestleDetailResponse result = - masterService - .getTrestleDetailList( - req.getModuleTpCd(), - req.getRoofMatlCd(), - req.getTrestleMkrCd(), - req.getConstMthdCd(), - req.getRoofBaseCd(), - req.getIlluminationTp(), - req.getInstHt(), - req.getStdWindSpeed(), - req.getStdSnowLd(), - req.getInclCd(), - req.getConstTp(), - req.getMixMatlNo(), - req.getRoofPitch()) - .getData(); - result.setRoofIndex(req.getRoofIndex()); - ApiResponse response = new ApiResponse<>(); - response.setData(result); - results.add(response); + ApiResponse response = + masterService.getTrestleDetailList( + req.getModuleTpCd(), + req.getRoofMatlCd(), + req.getTrestleMkrCd(), + req.getConstMthdCd(), + req.getRoofBaseCd(), + req.getIlluminationTp(), + req.getInstHt(), + req.getStdWindSpeed(), + req.getStdSnowLd(), + req.getInclCd(), + req.getConstTp(), + req.getMixMatlNo(), + req.getRoofPitch()); + + ApiTrestleDetailResponse data = response.getData(); + data.setRoofIndex(req.getRoofIndex()); // roofIndex 추가하기 위함 + ApiResultResponse resultCode = response.getResult(); + + ApiResponse resultResponse = new ApiResponse<>(); + resultResponse.setData(data); + resultResponse.setResult(resultCode); + results.add(resultResponse); } return results; }