From e8ac6ae01d09617bf1a4a263f540d70cebce91cb Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Mon, 13 Jan 2025 19:56:25 +0900 Subject: [PATCH 1/7] =?UTF-8?q?refactor:=20=EC=8B=9C=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EC=A4=91=20=EC=9E=90=EB=8F=99=20=EC=B6=94=EC=B2=9C=20PCS=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20api=20url=20=EC=A0=91?= =?UTF-8?q?=EB=91=90=EC=82=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/interplug/qcast/biz/master/MasterController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c8467e97..1cadacf8 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -264,7 +264,7 @@ public class MasterController { } @Operation(description = "시리즈 중 자동으로 추천 PCS 정보 조회한다.") - @PostMapping("/pcsAutoRecommendList") + @PostMapping("/getPcsAutoRecommendList") public ApiResponse getPcsAutoRecommendList( @RequestBody ApiPcsAutoRecommendRequest autoRecommendRequest) { return masterService.getPcsAutoRecommendList(autoRecommendRequest); From 9ed630736279c660ab42d6dee597cfb3cf02e659 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Mon, 13 Jan 2025 20:01:32 +0900 Subject: [PATCH 2/7] =?UTF-8?q?refactor:=20=EA=B0=80=EB=8C=80=20=EC=83=81?= =?UTF-8?q?=EC=84=B8=20=EC=A1=B0=ED=9A=8C=20api=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - method post로 수정 - request 데이터를 body json, list 형식으로 받아서 list size만큼 api 호출 후 response를 모아서 리턴 --- .../qcast/biz/master/MasterController.java | 96 +++++-------------- .../detail/ApiTrestleDetailRequest.java | 15 ++- 2 files changed, 36 insertions(+), 75 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 1cadacf8..bcdc17a2 100644 --- a/src/main/java/com/interplug/qcast/biz/master/MasterController.java +++ b/src/main/java/com/interplug/qcast/biz/master/MasterController.java @@ -12,12 +12,14 @@ import com.interplug.qcast.biz.master.dto.quotation.ApiQuotationItemRequest; import com.interplug.qcast.biz.master.dto.quotation.ApiQuotationItemResponse; import com.interplug.qcast.biz.master.dto.roofmaterial.ApiRoofMaterialResponse; import com.interplug.qcast.biz.master.dto.trestle.ApiTrestleResponse; +import com.interplug.qcast.biz.master.dto.trestle.detail.ApiTrestleDetailRequest; import com.interplug.qcast.biz.master.dto.trestle.detail.ApiTrestleDetailResponse; import com.interplug.qcast.config.Exception.ErrorCode; import com.interplug.qcast.config.Exception.QcastException; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.ArrayList; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; @@ -173,79 +175,29 @@ public class MasterController { } @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); + @PostMapping("/getTrestleDetailList") + public ArrayList> getTrestleDetailList( + @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); } - - ApiTrestleDetailBuilder atdb = - ApiTrestleDetailBuilder.builder() - .moduleTpCd(moduleTpCd) - .roofMatlCd(roofMatlCd) - .trestleMkrCd(trestleMkrCd) - .constMthdCd(constMthdCd) - .roofBaseCd(roofBaseCd) - .illuminationTp(illuminationTp) - .instHt(instHt) - .stdWindSpeed(stdWindSpeed) - .stdSnowLd(stdSnowLd) - .inclCd(inclCd) - .constTp(constTp) - .mixMatlNo(mixMatlNo) - .roofPitch(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()); + return results; } @Operation(description = "PCS 메이커, 시리즈 조회한다.") 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 bf43b0e3..f0776ce2 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 @@ -1,6 +1,7 @@ package com.interplug.qcast.biz.master.dto.trestle.detail; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; import lombok.Getter; import lombok.Setter; @@ -9,40 +10,48 @@ import lombok.Setter; @Schema(description = "Api 가대 상세 조회 요청 객체") public class ApiTrestleDetailRequest { - @Schema(description = "Language코드") - private String langCd; - @Schema(description = "모듈타입코드") + @NotNull private String moduleTpCd; @Schema(description = "지붕재코드") + @NotNull private String roofMatlCd; @Schema(description = "가대메이커코드") + @NotNull private String trestleMkrCd; @Schema(description = "공법코드") + @NotNull private String constMthdCd; @Schema(description = "지붕기초코드") + @NotNull private String roofBaseCd; @Schema(description = "면조도") + @NotNull private String illuminationTp; @Schema(description = "설치높이") + @NotNull private String instHt; @Schema(description = "풍속") + @NotNull private String stdWindSpeed; @Schema(description = "적설량") + @NotNull private String stdSnowLd; @Schema(description = "경사도코드") + @NotNull private String inclCd; @Schema(description = "시공법") + @NotNull private String constTp; @Schema(description = "혼합모듈번호") From 493f9a268a8875901fe1bc9a79358a8496167ef6 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Mon, 13 Jan 2025 20:37:23 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=EC=A7=80=EB=B6=95=EB=A9=B4=ED=95=A0?= =?UTF-8?q?=EB=8B=B9=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasBasicSettingController.java | 7 +++--- .../CanvasBasicSettingService.java | 23 ++++++++----------- .../dto/CanvasBasicSettingInfo.java | 1 - .../dto/RoofAllocationSettingInfo.java | 17 ++++++++++++++ 4 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationSettingInfo.java diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java index 87e5ab71..1dabfbd9 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java @@ -2,6 +2,7 @@ package com.interplug.qcast.biz.canvasBasicSetting; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse; +import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofAllocationSettingInfo; import com.interplug.qcast.config.Exception.QcastException; import io.swagger.v3.oas.annotations.Operation; @@ -45,11 +46,11 @@ public class CanvasBasicSettingController { @Operation(description = "지붕면 할당 정보를 등록 한다.") @PostMapping("/roof-allocation-settings/") @ResponseStatus(HttpStatus.CREATED) - public Map insertRoofAllocSetting(@RequestBody CanvasBasicSettingInfo rai) throws QcastException { + public Map insertRoofAllocSetting(@RequestBody RoofAllocationSettingInfo rasi) throws QcastException { - log.debug("지붕면 할당 등록 ::::: " + rai.getObjectNo()); + log.debug("지붕면 할당 등록 ::::: " + rasi.getObjectNo()); - return canvasBasicSettingService.insertRoofAllocSetting(rai); + return canvasBasicSettingService.insertRoofAllocSetting(rasi); } @Operation(description = "Canvas 지붕재추가 Setting 정보를 삭제 한다.") diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java index 1fc46d41..4ac2722f 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse; import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofAllocationInfo; +import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofAllocationSettingInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofMaterialsAddInfo; import com.interplug.qcast.config.Exception.ErrorCode; import com.interplug.qcast.config.Exception.QcastException; @@ -86,34 +87,28 @@ public class CanvasBasicSettingService { } // 지붕면 할당 Setting 등록 - public Map insertRoofAllocSetting(CanvasBasicSettingInfo csi) throws QcastException { + public Map insertRoofAllocSetting(RoofAllocationSettingInfo rasi) throws QcastException { Map response = new HashMap<>(); - - if (csi.getObjectNo() == null) { + + if (rasi.getObjectNo() == null) { throw new QcastException (ErrorCode.INVALID_INPUT_VALUE ,"올바르지 않은 입력값입니다."); } try { // 기존 지붕재추가 정보 삭제 후 insert - canvasBasicSettingMapper.deleteRoofMaterialsAdd(csi.getObjectNo()); + canvasBasicSettingMapper.deleteRoofMaterialsAdd(rasi.getObjectNo()); - int roofSeq = 0; // for-each 루프를 사용하여 지붕재추가 Setting - for (RoofAllocationInfo rai : csi.getRoofAllocationList()) { - - rai.setObjectNo(csi.getObjectNo()); - rai.setRoofSeq(roofSeq++); //roofSeq는 순차적으로 새로 생성하여 insert - - // 신규 지붕재추가 정보 insert + for (RoofAllocationInfo rai : rasi.getRoofAllocationList()) { + rai.setObjectNo(rasi.getObjectNo()); canvasBasicSettingMapper.insertRoofAllocation(rai); } - response.put("objectNo", csi.getObjectNo()); + response.put("objectNo", rasi.getObjectNo()); response.put("returnMessage", "common.message.confirm.mark"); - } catch (Exception e) { - response.put("objectNo", csi.getObjectNo()); + response.put("objectNo", rasi.getObjectNo()); response.put("returnMessage", "common.message.save.error"); } diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java index 292af877..b0152ba3 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/CanvasBasicSettingInfo.java @@ -18,5 +18,4 @@ public class CanvasBasicSettingInfo { private Date lastEditDatetime; //수정일시 private List roofMaterialsAddList; - private List roofAllocationList; } \ No newline at end of file diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationSettingInfo.java new file mode 100644 index 00000000..ee6f1ff1 --- /dev/null +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/dto/RoofAllocationSettingInfo.java @@ -0,0 +1,17 @@ +package com.interplug.qcast.biz.canvasBasicSetting.dto; + +import java.util.List; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class RoofAllocationSettingInfo { + + private String objectNo; //견적서 번호 + private Integer roofSizeSet; //치수(복사도/실측값/육지붕) + private String roofAngleSet; //각도(경사/각도) + + private List roofAllocationList; +} \ No newline at end of file From b5c795486e7bcb62ff06c0f796991c0dd6027814 Mon Sep 17 00:00:00 2001 From: lelalela Date: Mon, 13 Jan 2025 22:23:32 +0900 Subject: [PATCH 4/7] =?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 5/7] =?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; } From 7159629d1bf2e72339549c519ce9d20486ab56ea Mon Sep 17 00:00:00 2001 From: yoosangwook Date: Mon, 13 Jan 2025 22:55:14 +0900 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20api=20=EC=A3=BC=EC=86=8C=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 --- .../canvasBasicSetting/CanvasBasicSettingController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java index 1dabfbd9..691f0bb8 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasBasicSetting/CanvasBasicSettingController.java @@ -4,15 +4,12 @@ import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingInfo; import com.interplug.qcast.biz.canvasBasicSetting.dto.CanvasBasicSettingResponse; import com.interplug.qcast.biz.canvasBasicSetting.dto.RoofAllocationSettingInfo; import com.interplug.qcast.config.Exception.QcastException; - import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - import java.util.List; import java.util.Map; - +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; @@ -44,7 +41,7 @@ public class CanvasBasicSettingController { } @Operation(description = "지붕면 할당 정보를 등록 한다.") - @PostMapping("/roof-allocation-settings/") + @PostMapping("/roof-allocation-settings") @ResponseStatus(HttpStatus.CREATED) public Map insertRoofAllocSetting(@RequestBody RoofAllocationSettingInfo rasi) throws QcastException { From 560b96044a6413f0d8bd71079ff5a25add1a294a Mon Sep 17 00:00:00 2001 From: "LAPTOP-L3VE7KK2\\USER" Date: Tue, 14 Jan 2025 09:23:53 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EC=9E=84=EC=8B=9C=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateMapper.java | 3 ++ .../qcast/biz/estimate/EstimateService.java | 9 +++++- .../mappers/estimate/estimateMapper.xml | 29 +++++++++++++++++++ 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java index fc7acf1a..407a594c 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java @@ -108,6 +108,9 @@ public interface EstimateMapper { // 견적서 복사 public int insertEstimateCopy(EstimateCopyRequest estimateCopyRequest); + // 견적서 도면 아이템 복사 + public int insertEstimateDrawingItemCopy(EstimateCopyRequest estimateCopyRequest); + // Plan 확정 동기화 public int updatePlanConfirmSync(PlanSyncResponse planSyncData); } diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index 57d1f494..fd576929 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -784,6 +784,7 @@ public class EstimateService { itemRequest.setPkgMaterialFlg(itemResponse.getPkgMaterialFlg()); itemRequest.setFileUploadFlg(itemResponse.getFileUploadFlg()); itemRequest.setItemGroup(itemResponse.getItemGroup()); + itemRequest.setOpenFlg(itemResponse.getOpenFlg()); break; } @@ -810,7 +811,7 @@ public class EstimateService { estimateMapper.insertEstimateItem(itemRequest); } - // [6]. 견적서 지붕재 복사 + // [6]. 견적서 지붕재 및 도면 초기 데이터 복사 List roofList = estimateMapper.selectEstimateRoofList(estimateRequest); List roofItemList = estimateMapper.selectEstimateRoofItemList(estimateRequest); List circuitItemList = @@ -868,9 +869,13 @@ public class EstimateService { estimateMapper.insertEstimateCircuitItem(circuitItemRequest); } + // 도면 초기 데이타 복사(초기화 위해 필요) + estimateMapper.insertEstimateDrawingItemCopy(estimateCopyRequest); + // [7]. 견적서 도면 복사 (추후 개발 필요) // [8]. QSP Q.CAST SEND API + /* List resultList = new ArrayList(); estimateRequest.setObjectNo(estimateCopyRequest.getCopyObjectNo()); estimateRequest.setPlanNo(estimateCopyRequest.getCopyPlanNo()); @@ -885,6 +890,7 @@ public class EstimateService { estimateMapper.updateEstimateApi(estimateRequest); } + */ } catch (Exception e) { throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR); @@ -960,6 +966,7 @@ public class EstimateService { String[] arrItemId = new String[itemList.size()]; int i = 0; for (ItemRequest itemRequest : itemList) { + System.out.println(">>>>>>>>>>>>>>>>" + itemRequest.getItemId()); arrItemId[i++] = itemRequest.getItemId(); } estimateRequest.setArrItemId(arrItemId); diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 09fba332..7e7e8f84 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -1011,6 +1011,8 @@ , CONSTRUCT_SPECIFICATION_MULTI , SURFACE_TYPE , ANGLE + , TEMP_FLG + , LOCK_FLG , SYNC_FLG , CREATE_DATETIME , CREATE_USER @@ -1062,6 +1064,8 @@ , P.CONSTRUCT_SPECIFICATION_MULTI , P.SURFACE_TYPE , P.ANGLE + , '1' AS TEMP_FLG + , '0' AS LOCK_FLG , '0' AS SYNC_FLG , GETDATE() AS CREATE_DATETIME , #{userId} AS CREATE_USER @@ -1071,6 +1075,31 @@ AND P.DEL_FLG = '0' + + /* sqlid : com.interplug.qcast.biz.estimate.insertEstimateDrawingItemCopy */ + INSERT INTO T_PART_DRAWING_ESTIMATE + ( + OBJECT_NO + , PLAN_NO + , DISP_ORDER + , ITEM_ID + , AMOUNT + , LAST_EDIT_DATETIME + , LAST_EDIT_USER + ) + SELECT + #{copyObjectNo} AS OBJECT_NO + , #{copyPlanNo} AS PLAN_NO + , PDE.DISP_ORDER + , PDE.ITEM_ID + , PDE.AMOUNT + , GETDATE() AS LAST_EDIT_DATETIME + , #{userId} AS LAST_EDIT_USER + FROM T_PART_DRAWING_ESTIMATE PDE WITH (NOLOCK) + WHERE PDE.OBJECT_NO = #{objectNo} + AND PDE.PLAN_NO = #{planNo} + + /* sqlid : com.interplug.qcast.biz.estimate.updatePlanConfirmSync */ UPDATE T_PLAN