From 7e4a240e2acc66abdec2c58a87c41b44458ae674 Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Fri, 17 Jan 2025 16:59:28 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20canvas=20status=20=ED=8C=A8?= =?UTF-8?q?=ED=82=A4=EC=A7=80=20=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - planNo 추가 - image_name 삭제 - description, 주석 설명 수정 --- .../canvasStatus/CanvasStatusController.java | 12 ++++----- .../biz/canvasStatus/CanvasStatusMapper.java | 18 ++++++------- .../biz/canvasStatus/CanvasStatusService.java | 20 +++++++------- .../biz/canvasStatus/dto/CanvasStatus.java | 2 +- .../dto/CanvasStatusResponse.java | 2 +- .../canvasStatus/canvasStatusMapper.xml | 27 ++++++++++--------- 6 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java index 80736052..27ef93d3 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java @@ -17,41 +17,41 @@ import org.springframework.web.bind.annotation.*; public class CanvasStatusController { private final CanvasStatusService canvasStatusService; - @Operation(description = "계정에 해당하는 전체 견적서를 조회 한다.") + @Operation(description = "사용자(userId)에 해당하는 전체 캔버스를 조회 한다.") @GetMapping("/canvas-statuses/{userId}") public List selectAllCanvasStatus(@PathVariable String userId) throws QcastException { return canvasStatusService.selectAllCanvasStatus(userId); } - @Operation(description = "견적서를 조회 한다.") + @Operation(description = "사용자(userId)와 물건번호(objectNo)에 해당하는 캔버스를 조회 한다.") @GetMapping("/canvas-statuses/by-object/{objectNo}/{userId}") public List selectObjectNoCanvasStatus( @PathVariable String objectNo, @PathVariable String userId) throws QcastException { return canvasStatusService.selectObjectNoCanvasStatus(objectNo, userId); } - @Operation(description = "견적서를 등록 한다.") + @Operation(description = "캔버스를 등록 한다.") @PostMapping("/canvas-statuses") @ResponseStatus(HttpStatus.CREATED) public Integer insertCanvasStatus(@RequestBody CanvasStatus cs) throws QcastException { return canvasStatusService.insertCanvasStatus(cs); } - @Operation(description = "견적서를 수정 한다.") + @Operation(description = "캔버스를 수정 한다.") @PutMapping("/canvas-statuses") public void updateCanvasStatus(@RequestBody CanvasStatus cs) throws QcastException { canvasStatusService.updateCanvasStatus(cs); } - @Operation(description = "견적서를 삭제 한다.") + @Operation(description = "물건번호(objectNo)에 해당하는캔버스를 삭제 한다.") @DeleteMapping("/canvas-statuses/by-object/{objectNo}") @ResponseStatus(HttpStatus.NO_CONTENT) public void deleteObjectNoCanvasStatus(@PathVariable String objectNo) throws QcastException { canvasStatusService.deleteObjectNoCanvasStatus(objectNo); } - @Operation(description = "견적서의 이미지(템플릿)를 삭제 한다.") + @Operation(description = "id에 해당하는 캔버스를 삭제 한다.") @DeleteMapping("/canvas-statuses/by-id/{id}") @ResponseStatus(HttpStatus.NO_CONTENT) public void deleteIdCanvasStatus(@PathVariable Integer id) throws QcastException { diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java index df5bb1d5..94c312e0 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java @@ -14,30 +14,30 @@ public interface CanvasStatusMapper { // imageName 생성(미사용) public CanvasStatus getCanvasStatusImageAdd(String objectNo); - // 전체 견적서 조회 + // 전체 캔버스 조회 by 사용자(userId) public List selectAllCanvasStatus(String userId); - // 견적서 조회(objectNo/userId) + // 캔버스 조회 by 물건번호(objectNo) && 사용자(userId) public List selectObjectNoCanvasStatus(String objectNo, String userId); - // 견적서 조회(Max id) + // 캔버스 조회 by Max(id) public List getMaxIdCanvasStatus(String objectNo, String userId); - // 견적서 조회(id별) + // 캔버스 조회 by id public List getIdCanvasStatus(Integer id); - // 견적서 조회(objectNo) + // 캔버스 조회 by 물건번호(objectNo) public List getObjectNoCanvasStatus(String objectNo); - // 견적서 등록 + // 캔버스 등록 public void insertCanvasStatus(CanvasStatus cs); - // 견적서 수정 + // 캔버스 수정 public void updateCanvasStatus(CanvasStatus cs); - // 견적서 삭제 + // 캔버스 삭제 by 물건번호(objectNo) public void deleteObjectNoCanvasStatus(String objectNo); - // 이미지(템플릿) 삭제 + // 캔버스 삭제 by id public void deleteIdCanvasStatus(Integer id); } diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java index f3483548..281bb3e3 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; public class CanvasStatusService { private final CanvasStatusMapper canvasStatusMapper; - // 전체 견적서 조회 + // 사용자(userId)에 해당하는 전체 캔버스 조회 public List selectAllCanvasStatus(String userId) throws QcastException { List result = null; @@ -26,7 +26,7 @@ public class CanvasStatusService { return result; } - // 견적서 조회(objectNo) + // 사용자(userId)와 물건번호(objectNo)에 해당하는 캔버스 조회 public List selectObjectNoCanvasStatus(String objectNo, String userId) throws QcastException { List result = null; @@ -43,7 +43,7 @@ public class CanvasStatusService { return result; } - // 견적서 등록 + // 캔버스 등록 public Integer insertCanvasStatus(CanvasStatus cs) throws QcastException { Integer id = 0; @@ -58,14 +58,14 @@ public class CanvasStatusService { id = maxId.get(0).getId(); } catch (Exception e) { - throw new QcastException(ErrorCode.INVALID_INPUT_VALUE, "견적서 등록 중 오류 발생"); + throw new QcastException(ErrorCode.INVALID_INPUT_VALUE, "캔버스 등록 중 오류 발생"); } // 생성된 id 반환 return id; } - // 견적서 수정 + // 캔버스 수정 public void updateCanvasStatus(CanvasStatus cs) throws QcastException { if (cs.getId() == null) { @@ -79,11 +79,11 @@ public class CanvasStatusService { if (existingStatus.size() > 0) { canvasStatusMapper.updateCanvasStatus(cs); } else { - throw new QcastException(ErrorCode.NOT_FOUND, "수정할 견적서가 존재하지 않습니다."); + throw new QcastException(ErrorCode.NOT_FOUND, "수정할 캔버스가 존재하지 않습니다."); } } - // 전체 견적서 삭제 + // 물건번호(objectNo)에 해당하는 캔버스 삭제 public void deleteObjectNoCanvasStatus(String objectNo) throws QcastException { if (objectNo == null || objectNo.trim().isEmpty()) { @@ -98,11 +98,11 @@ public class CanvasStatusService { if (existingStatus.size() > 0) { canvasStatusMapper.deleteObjectNoCanvasStatus(objectNo); } else { - throw new QcastException(ErrorCode.NOT_FOUND, "삭제할 견적서가 존재하지 않습니다."); + throw new QcastException(ErrorCode.NOT_FOUND, "삭제할 캔버스가 존재하지 않습니다."); } } - // 이미지(템플릿) 삭제 + // id에 해당하는 캔버스 삭제 public void deleteIdCanvasStatus(Integer id) throws QcastException { if (id == null) { @@ -116,7 +116,7 @@ public class CanvasStatusService { if (existingStatus.size() > 0) { canvasStatusMapper.deleteIdCanvasStatus(id); } else { - throw new QcastException(ErrorCode.NOT_FOUND, "삭제할 견적서가 존재하지 않습니다."); + throw new QcastException(ErrorCode.NOT_FOUND, "삭제할 캔버스가 존재하지 않습니다."); } } } diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatus.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatus.java index f0a74443..f5e25418 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatus.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatus.java @@ -7,7 +7,7 @@ public class CanvasStatus { private Integer id; // PK ID private String userId; // 사용자 ID private String objectNo; // 견적서 번호 - private String imageName; // 이미지명 + private String planNo; // 플랜 번호 private String canvasStatus; // 캠버스 상태 private String bgImageName; // 배경 이미지명 private String mapPositionAddress; // 배경 CAD 파일명 diff --git a/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatusResponse.java b/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatusResponse.java index e6530eda..4fb4a44c 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatusResponse.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/dto/CanvasStatusResponse.java @@ -10,7 +10,7 @@ public class CanvasStatusResponse { private Integer id; // PK ID private String userId; // 사용자 ID private String objectNo; // 견적서 번호 - private String imageName; // 이미지명 + private String planNo; // 플랜 번호 private String canvasStatus; // 캠버스 상태 private Date registDatetime; // 생성일시 private Date lastEditDatetime; // 수정일시 diff --git a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml index cf2acfb6..92a207e8 100644 --- a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml +++ b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml @@ -22,11 +22,11 @@ - /* sqlid : com.interplug.qcast.canvasStatus.selectObjectNoCanvasStatus 견적서 조회 */ + /* sqlid : com.interplug.qcast.canvasStatus.selectObjectNoCanvasStatus 캔버스 조회 by (물건번호(objectNo) + and 사용자(userId)) */ SELECT id , user_id , object_no - , image_name + , plan_no , canvas_status , regist_datetime , last_edit_datetime @@ -57,7 +58,7 @@ - /* sqlid : com.interplug.qcast.canvasStatus.getIdCanvasStatus 견적서 조회(id별) */ + /* sqlid : com.interplug.qcast.canvasStatus.getIdCanvasStatus 캔버스 조회 by id */ SELECT id FROM TB_CANVAS_STATUS WHERE id = #{id} @@ -74,7 +75,7 @@