From e8b13ae9c670b991a176b698cf25ba99fd7ad0c9 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Wed, 8 Jan 2025 17:57:26 +0900 Subject: [PATCH] =?UTF-8?q?style:=20=ED=8F=AC=EB=A7=B7=ED=84=B0=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/master/MasterController.java | 306 +++++++++++------- .../qcast/biz/master/MasterService.java | 71 ++-- .../qcast/biz/master/dto/ApiResponse.java | 21 +- 3 files changed, 239 insertions(+), 159 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 73210224..517b0ff6 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -49,125 +49,207 @@ public class MasterController { @Operation(description = "가대 목록 조회한다.") @GetMapping("/getTrestleList") public ApiResponse getTrestleList( - @Parameter(description = "모듈타입코드") @RequestParam(required = false) String moduleTpCd, - @Parameter(description = "지붕재코드") @RequestParam(required = false) String roofMatlCd, - @Parameter(description = "서까래기초코드") @RequestParam(required = false) String raftBaseCd, - @Parameter(description = "가대메이커코드") @RequestParam(required = false) String trestleMkrCd, - @Parameter(description = "공법코드") @RequestParam(required = false) String constMthdCd, - @Parameter(description = "지붕기초코드") @RequestParam(required = false) String roofBaseCd) { - - ApiTrestleBuilder apiTrestleInfoBuilder = new ApiTrestleBuilder(moduleTpCd, roofMatlCd, raftBaseCd, trestleMkrCd, constMthdCd, roofBaseCd); - ApiTrestleBuilder atb = apiTrestleInfoBuilder - .setModuleTpCd(moduleTpCd) - .setRoofMatlCdCd(roofMatlCd) - .setRaftBaseCd(raftBaseCd) - .setTrestleMkrCd(trestleMkrCd) - .setConstMthdCd(constMthdCd) - .setRoofBaseCd(roofBaseCd) - .build(); - return masterService.getTrestleList(atb.getModuleTpCd(),atb.getRoofMatlCd(),atb.getRaftBaseCd(),atb.getTrestleMkrCd(),atb.getConstMthdCd(),atb.getRoofBaseCd()); + @Parameter(description = "모듈타입코드") @RequestParam(required = false) String moduleTpCd, + @Parameter(description = "지붕재코드") @RequestParam(required = false) String roofMatlCd, + @Parameter(description = "서까래기초코드") @RequestParam(required = false) String raftBaseCd, + @Parameter(description = "가대메이커코드") @RequestParam(required = false) String trestleMkrCd, + @Parameter(description = "공법코드") @RequestParam(required = false) String constMthdCd, + @Parameter(description = "지붕기초코드") @RequestParam(required = false) String roofBaseCd) { + + ApiTrestleBuilder apiTrestleInfoBuilder = + new ApiTrestleBuilder( + moduleTpCd, roofMatlCd, raftBaseCd, trestleMkrCd, constMthdCd, roofBaseCd); + ApiTrestleBuilder atb = + apiTrestleInfoBuilder + .setModuleTpCd(moduleTpCd) + .setRoofMatlCdCd(roofMatlCd) + .setRaftBaseCd(raftBaseCd) + .setTrestleMkrCd(trestleMkrCd) + .setConstMthdCd(constMthdCd) + .setRoofBaseCd(roofBaseCd) + .build(); + return masterService.getTrestleList( + atb.getModuleTpCd(), + atb.getRoofMatlCd(), + atb.getRaftBaseCd(), + atb.getTrestleMkrCd(), + atb.getConstMthdCd(), + atb.getRoofBaseCd()); } - + @Operation(description = "시공법 목록 조회한다.") @GetMapping("/getConstructionList") public ApiResponse getConstructionList( - @Parameter(description = "모듈타입코드") @RequestParam String moduleTpCd, - @Parameter(description = "지붕재코드") @RequestParam String roofMatlCd, - @Parameter(description = "가대메이커코드") @RequestParam String trestleMkrCd, - @Parameter(description = "공법코드") @RequestParam String constMthdCd, - @Parameter(description = "지붕기초코드") @RequestParam String roofBaseCd, - @Parameter(description = "면조도") @RequestParam String illuminationTp, - @Parameter(description = "설치높이") @RequestParam String instHt, - @Parameter(description = "풍속") @RequestParam String stdWindSpeed, - @Parameter(description = "적설량") @RequestParam String stdSnowLd, - @Parameter(description = "경사도코드") @RequestParam String inclCd, - @Parameter(description = "서까래기초코드") @RequestParam(required = false) String raftBaseCd, - @Parameter(description = "하제(망둥어)피치") @RequestParam(required = false) Integer roofPitch) throws QcastException { - - if (moduleTpCd == null || moduleTpCd.trim().isEmpty() || - roofMatlCd == null || roofMatlCd.trim().isEmpty() || - trestleMkrCd == null || trestleMkrCd.trim().isEmpty() || - constMthdCd == null || constMthdCd.trim().isEmpty() || - roofBaseCd == null || roofBaseCd.trim().isEmpty() || - illuminationTp == null || illuminationTp.trim().isEmpty() || - instHt == null || instHt.trim().isEmpty() || - stdWindSpeed == null || stdWindSpeed.trim().isEmpty() || - stdSnowLd == null || stdSnowLd.trim().isEmpty() || - inclCd == null || inclCd.trim().isEmpty()) { - throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); - } - - ApiConstructionBuilder apiConstructionBuilder = new ApiConstructionBuilder(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp - , instHt, stdWindSpeed, stdSnowLd, inclCd, raftBaseCd, roofPitch); - ApiConstructionBuilder acb = apiConstructionBuilder - .setModuleTpCd(moduleTpCd) - .setRoofMatlCd(roofMatlCd) - .setTrestleMkrCd(trestleMkrCd) - .setConstMthdCd(constMthdCd) - .setRoofBaseCd(roofBaseCd) - .setIlluminationTp(illuminationTp) - .setInstHt(instHt) - .setStdWindSpeed(stdWindSpeed) - .setStdSnowLd(stdSnowLd) - .setInclCd(inclCd) - .setRaftBaseCd(raftBaseCd) - .setRoofPitch(roofPitch) - .build(); - - return masterService.getConstructionList(acb.getModuleTpCd(), acb.getRoofMatlCd(), acb.getTrestleMkrCd(), acb.getConstMthdCd(), acb.getRoofBaseCd(), acb.getIlluminationTp() - , acb.getInstHt(), acb.getStdWindSpeed(), acb.getStdSnowLd(), acb.getInclCd(), acb.getRaftBaseCd(), acb.getRoofPitch()); + @Parameter(description = "모듈타입코드") @RequestParam String moduleTpCd, + @Parameter(description = "지붕재코드") @RequestParam String roofMatlCd, + @Parameter(description = "가대메이커코드") @RequestParam String trestleMkrCd, + @Parameter(description = "공법코드") @RequestParam String constMthdCd, + @Parameter(description = "지붕기초코드") @RequestParam String roofBaseCd, + @Parameter(description = "면조도") @RequestParam String illuminationTp, + @Parameter(description = "설치높이") @RequestParam String instHt, + @Parameter(description = "풍속") @RequestParam String stdWindSpeed, + @Parameter(description = "적설량") @RequestParam String stdSnowLd, + @Parameter(description = "경사도코드") @RequestParam String inclCd, + @Parameter(description = "서까래기초코드") @RequestParam(required = false) String raftBaseCd, + @Parameter(description = "하제(망둥어)피치") @RequestParam(required = false) Integer roofPitch) + throws QcastException { + + if (moduleTpCd == null + || moduleTpCd.trim().isEmpty() + || roofMatlCd == null + || roofMatlCd.trim().isEmpty() + || trestleMkrCd == null + || trestleMkrCd.trim().isEmpty() + || constMthdCd == null + || constMthdCd.trim().isEmpty() + || roofBaseCd == null + || roofBaseCd.trim().isEmpty() + || illuminationTp == null + || illuminationTp.trim().isEmpty() + || instHt == null + || instHt.trim().isEmpty() + || stdWindSpeed == null + || stdWindSpeed.trim().isEmpty() + || stdSnowLd == null + || stdSnowLd.trim().isEmpty() + || inclCd == null + || inclCd.trim().isEmpty()) { + throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); + } + + ApiConstructionBuilder apiConstructionBuilder = + new ApiConstructionBuilder( + moduleTpCd, + roofMatlCd, + trestleMkrCd, + constMthdCd, + roofBaseCd, + illuminationTp, + instHt, + stdWindSpeed, + stdSnowLd, + inclCd, + raftBaseCd, + roofPitch); + ApiConstructionBuilder acb = + apiConstructionBuilder + .setModuleTpCd(moduleTpCd) + .setRoofMatlCd(roofMatlCd) + .setTrestleMkrCd(trestleMkrCd) + .setConstMthdCd(constMthdCd) + .setRoofBaseCd(roofBaseCd) + .setIlluminationTp(illuminationTp) + .setInstHt(instHt) + .setStdWindSpeed(stdWindSpeed) + .setStdSnowLd(stdSnowLd) + .setInclCd(inclCd) + .setRaftBaseCd(raftBaseCd) + .setRoofPitch(roofPitch) + .build(); + + return masterService.getConstructionList( + acb.getModuleTpCd(), + acb.getRoofMatlCd(), + acb.getTrestleMkrCd(), + acb.getConstMthdCd(), + acb.getRoofBaseCd(), + acb.getIlluminationTp(), + acb.getInstHt(), + acb.getStdWindSpeed(), + acb.getStdSnowLd(), + acb.getInclCd(), + acb.getRaftBaseCd(), + acb.getRoofPitch()); } - + @Operation(description = "가대 상세 조회한다.") @GetMapping("/getTrestleDetailList") public ApiResponse getTrestleDetailList( - @Parameter(description = "모듈타입코드") @RequestParam String moduleTpCd, - @Parameter(description = "지붕재코드") @RequestParam String roofMatlCd, - @Parameter(description = "가대메이커코드") @RequestParam String trestleMkrCd, - @Parameter(description = "공법코드") @RequestParam String constMthdCd, - @Parameter(description = "지붕기초코드") @RequestParam String roofBaseCd, - @Parameter(description = "면조도") @RequestParam String illuminationTp, - @Parameter(description = "설치높이") @RequestParam String instHt, - @Parameter(description = "풍속") @RequestParam String stdWindSpeed, - @Parameter(description = "적설량") @RequestParam String stdSnowLd, - @Parameter(description = "경사도코드") @RequestParam String inclCd, - @Parameter(description = "시공법") @RequestParam String constTp, - @Parameter(description = "혼합모듈번호") @RequestParam(required = false) Integer mixMatlNo, - @Parameter(description = "하제(망둥어)피치") @RequestParam(required = false) Integer roofPitch) throws QcastException { - - if (moduleTpCd == null || moduleTpCd.trim().isEmpty() || - roofMatlCd == null || roofMatlCd.trim().isEmpty() || - trestleMkrCd == null || trestleMkrCd.trim().isEmpty() || - constMthdCd == null || constMthdCd.trim().isEmpty() || - roofBaseCd == null || roofBaseCd.trim().isEmpty() || - illuminationTp == null || illuminationTp.trim().isEmpty() || - instHt == null || instHt.trim().isEmpty() || - stdWindSpeed == null || stdWindSpeed.trim().isEmpty() || - stdSnowLd == null || stdSnowLd.trim().isEmpty() || - inclCd == null || inclCd.trim().isEmpty() || - constTp == null || constTp.trim().isEmpty()) { - throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); - } - - ApiTrestleDetailBuilder apiTrestleDetailBuilder = new ApiTrestleDetailBuilder(moduleTpCd, roofMatlCd, trestleMkrCd, constMthdCd, roofBaseCd, illuminationTp - , instHt, stdWindSpeed, stdSnowLd, inclCd, constTp, mixMatlNo, roofPitch); - ApiTrestleDetailBuilder atdb = apiTrestleDetailBuilder - .setModuleTpCd(moduleTpCd) - .setRoofMatlCd(roofMatlCd) - .setTrestleMkrCd(trestleMkrCd) - .setConstMthdCd(constMthdCd) - .setRoofBaseCd(roofBaseCd) - .setIlluminationTp(illuminationTp) - .setInstHt(instHt) - .setStdWindSpeed(stdWindSpeed) - .setStdSnowLd(stdSnowLd) - .setInclCd(inclCd) - .setConstTp(constTp) - .setMixMatlNo(mixMatlNo) - .setRoofPitch(roofPitch) - .build(); - - return masterService.getTrestleDetailList(atdb.getModuleTpCd(), atdb.getRoofMatlCd(), atdb.getTrestleMkrCd(), atdb.getConstMthdCd(), atdb.getRoofBaseCd(), atdb.getIlluminationTp() - , atdb.getInstHt(), atdb.getStdWindSpeed(), atdb.getStdSnowLd(), atdb.getInclCd(), atdb.getConstTp(), atdb.getMixMatlNo(), atdb.getRoofPitch()); + @Parameter(description = "모듈타입코드") @RequestParam String moduleTpCd, + @Parameter(description = "지붕재코드") @RequestParam String roofMatlCd, + @Parameter(description = "가대메이커코드") @RequestParam String trestleMkrCd, + @Parameter(description = "공법코드") @RequestParam String constMthdCd, + @Parameter(description = "지붕기초코드") @RequestParam String roofBaseCd, + @Parameter(description = "면조도") @RequestParam String illuminationTp, + @Parameter(description = "설치높이") @RequestParam String instHt, + @Parameter(description = "풍속") @RequestParam String stdWindSpeed, + @Parameter(description = "적설량") @RequestParam String stdSnowLd, + @Parameter(description = "경사도코드") @RequestParam String inclCd, + @Parameter(description = "시공법") @RequestParam String constTp, + @Parameter(description = "혼합모듈번호") @RequestParam(required = false) Integer mixMatlNo, + @Parameter(description = "하제(망둥어)피치") @RequestParam(required = false) Integer roofPitch) + throws QcastException { + + if (moduleTpCd == null + || moduleTpCd.trim().isEmpty() + || roofMatlCd == null + || roofMatlCd.trim().isEmpty() + || trestleMkrCd == null + || trestleMkrCd.trim().isEmpty() + || constMthdCd == null + || constMthdCd.trim().isEmpty() + || roofBaseCd == null + || roofBaseCd.trim().isEmpty() + || illuminationTp == null + || illuminationTp.trim().isEmpty() + || instHt == null + || instHt.trim().isEmpty() + || stdWindSpeed == null + || stdWindSpeed.trim().isEmpty() + || stdSnowLd == null + || stdSnowLd.trim().isEmpty() + || inclCd == null + || inclCd.trim().isEmpty() + || constTp == null + || constTp.trim().isEmpty()) { + throw new QcastException(ErrorCode.INVALID_INPUT_VALUE); + } + + ApiTrestleDetailBuilder apiTrestleDetailBuilder = + new ApiTrestleDetailBuilder( + moduleTpCd, + roofMatlCd, + trestleMkrCd, + constMthdCd, + roofBaseCd, + illuminationTp, + instHt, + stdWindSpeed, + stdSnowLd, + inclCd, + constTp, + mixMatlNo, + roofPitch); + ApiTrestleDetailBuilder atdb = + apiTrestleDetailBuilder + .setModuleTpCd(moduleTpCd) + .setRoofMatlCd(roofMatlCd) + .setTrestleMkrCd(trestleMkrCd) + .setConstMthdCd(constMthdCd) + .setRoofBaseCd(roofBaseCd) + .setIlluminationTp(illuminationTp) + .setInstHt(instHt) + .setStdWindSpeed(stdWindSpeed) + .setStdSnowLd(stdSnowLd) + .setInclCd(inclCd) + .setConstTp(constTp) + .setMixMatlNo(mixMatlNo) + .setRoofPitch(roofPitch) + .build(); + + return masterService.getTrestleDetailList( + atdb.getModuleTpCd(), + atdb.getRoofMatlCd(), + atdb.getTrestleMkrCd(), + atdb.getConstMthdCd(), + atdb.getRoofBaseCd(), + atdb.getIlluminationTp(), + atdb.getInstHt(), + atdb.getStdWindSpeed(), + atdb.getStdSnowLd(), + atdb.getInclCd(), + atdb.getConstTp(), + atdb.getMixMatlNo(), + atdb.getRoofPitch()); } } 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 64a9e640..acf61ea5 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterService.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterService.java @@ -27,44 +27,43 @@ public interface MasterService { // 가대 목록 조회 @GetMapping("/trestle") public ApiResponse getTrestleList( - @RequestParam(required = false) String moduleTpCd, - @RequestParam(required = false) String roofMatlCd, - @RequestParam(required = false) String raftBaseCd, - @RequestParam(required = false) String trestleMkrCd, - @RequestParam(required = false) String constMthdCd, - @RequestParam(required = false) String roofBaseCd); + @RequestParam(required = false) String moduleTpCd, + @RequestParam(required = false) String roofMatlCd, + @RequestParam(required = false) String raftBaseCd, + @RequestParam(required = false) String trestleMkrCd, + @RequestParam(required = false) String constMthdCd, + @RequestParam(required = false) String roofBaseCd); // 시공법 목록 조회 - @GetMapping("/construction") + @GetMapping("/construction") public ApiResponse getConstructionList( - @RequestParam String moduleTpCd, - @RequestParam String roofMatlCd, - @RequestParam String trestleMkrCd, - @RequestParam String constMthdCd, - @RequestParam String roofBaseCd, - @RequestParam String illuminationTp, - @RequestParam String instHt, - @RequestParam String stdWindSpeed, - @RequestParam String stdSnowLd, - @RequestParam String inclCd, - @RequestParam(required = false) String raftBaseCd, - @RequestParam(required = false) Integer roofPitch); - - // 가대 상세 조회 - @GetMapping("/trestle/detail") - public ApiResponse getTrestleDetailList( - @RequestParam String moduleTpCd, - @RequestParam String roofMatlCd, - @RequestParam String trestleMkrCd, - @RequestParam String constMthdCd, - @RequestParam String roofBaseCd, - @RequestParam String illuminationTp, - @RequestParam String instHt, - @RequestParam String stdWindSpeed, - @RequestParam String stdSnowLd, - @RequestParam String inclCd, - @RequestParam String constTp, - @RequestParam(required = false) Integer mixMatlNo, - @RequestParam(required = false) Integer roofPitch); + @RequestParam String moduleTpCd, + @RequestParam String roofMatlCd, + @RequestParam String trestleMkrCd, + @RequestParam String constMthdCd, + @RequestParam String roofBaseCd, + @RequestParam String illuminationTp, + @RequestParam String instHt, + @RequestParam String stdWindSpeed, + @RequestParam String stdSnowLd, + @RequestParam String inclCd, + @RequestParam(required = false) String raftBaseCd, + @RequestParam(required = false) Integer roofPitch); + // 가대 상세 조회 + @GetMapping("/trestle/detail") + public ApiResponse getTrestleDetailList( + @RequestParam String moduleTpCd, + @RequestParam String roofMatlCd, + @RequestParam String trestleMkrCd, + @RequestParam String constMthdCd, + @RequestParam String roofBaseCd, + @RequestParam String illuminationTp, + @RequestParam String instHt, + @RequestParam String stdWindSpeed, + @RequestParam String stdSnowLd, + @RequestParam String inclCd, + @RequestParam String constTp, + @RequestParam(required = false) Integer mixMatlNo, + @RequestParam(required = false) Integer roofPitch); } diff --git a/src/main/java/com/interplug/qcast/biz/master/dto/ApiResponse.java b/src/main/java/com/interplug/qcast/biz/master/dto/ApiResponse.java index 0c33033b..ea3f5b8f 100644 --- a/src/main/java/com/interplug/qcast/biz/master/dto/ApiResponse.java +++ b/src/main/java/com/interplug/qcast/biz/master/dto/ApiResponse.java @@ -1,8 +1,7 @@ package com.interplug.qcast.biz.master.dto; -import java.util.List; - import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; import lombok.Getter; import lombok.Setter; @@ -10,13 +9,13 @@ import lombok.Setter; @Setter @Schema(description = "결과 데이터") public class ApiResponse { - - @Schema(description = "목록 데이터") - private List data; - - @Schema(description = "목록 데이터2") - private List data2; - - @Schema(description = "API 결과 데이터") - private ApiResultResponse result; + + @Schema(description = "목록 데이터") + private List data; + + @Schema(description = "목록 데이터2") + private List data2; + + @Schema(description = "API 결과 데이터") + private ApiResultResponse result; }