From 493f9a268a8875901fe1bc9a79358a8496167ef6 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Mon, 13 Jan 2025 20:37:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=B6=95=EB=A9=B4=ED=95=A0=EB=8B=B9?= =?UTF-8?q?=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