From 63a1393cf487cc81d78d85e21dd55be276a65f19 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Fri, 20 Sep 2024 15:12:44 +0900 Subject: [PATCH] =?UTF-8?q?Canvas=20=EC=84=A4=EC=A0=95=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=20=EC=8B=9C=20=EB=A9=94=EC=8B=9C=EC=A7=80=20return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvasSetting/CanvasSettingController.java | 4 ++-- .../biz/canvasSetting/CanvasSettingMapper.java | 2 -- .../biz/canvasSetting/CanvasSettingService.java | 16 ++++++++++++---- .../biz/canvasSetting/dto/CanvasSettingInfo.java | 3 ++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java index 838f4a36..78d42507 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingController.java @@ -7,7 +7,7 @@ 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 org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; @@ -32,7 +32,7 @@ public class CanvasSettingController { @Operation(description = "Canvas Setting 정보를 등록 한다.") @PostMapping("/canvas-settings") @ResponseStatus(HttpStatus.CREATED) - public String insertCanvasStatus(@RequestBody CanvasSettingInfo csi) { + public Map insertCanvasStatus(@RequestBody CanvasSettingInfo csi) { log.debug("Setting 등록 ::::: " + csi.getObjectNo()); diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java index ca263830..f4b6a2d2 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingMapper.java @@ -2,8 +2,6 @@ package com.interplug.qcast.biz.canvasSetting; import com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java index 4441da16..137a9eb2 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/CanvasSettingService.java @@ -4,7 +4,8 @@ import com.interplug.qcast.biz.canvasSetting.dto.CanvasSettingInfo; import lombok.RequiredArgsConstructor; -import java.util.List; +import java.util.HashMap; +import java.util.Map; import org.springframework.stereotype.Service; @@ -19,16 +20,23 @@ public class CanvasSettingService { } // Canvas Setting 등록 - public String insertCanvasSetting(CanvasSettingInfo csi) { + public Map insertCanvasSetting(CanvasSettingInfo csi) { + + Map response = new HashMap<>(); try { canvasSettingMapper.insertCanvasSetting(csi); + + response.put("objectNo", csi.getObjectNo()); + response.put("returnMessage", "설정이 저장되었습니다."); + } catch (Exception e) { - System.out.println("오류 발생 : " + e.getMessage()); + response.put("objectNo", csi.getObjectNo()); + response.put("returnMessage", "오류 발생 : " + e.getMessage()); } // 생성된 objectNo 반환 - return csi.getObjectNo(); + return response; } diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java index da2f995b..88356a2c 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java @@ -9,7 +9,7 @@ import lombok.Setter; @Setter public class CanvasSettingInfo { - private String objectNo; //견적서 번호 + private String objectNo; //견적서 번호 private boolean assignDisplay; //할당 표시 private boolean drawDisplay; //도면 표시 private boolean gridDisplay; //그리드 표시 @@ -35,5 +35,6 @@ public class CanvasSettingInfo { private boolean adsorpPointAdd; //흡착점 추가 private Date registDatetime; //생성일시 private Date lastEditDatetime; //수정일시 + private String returnMessage; //return message }