From 53753b3c86fe66843e496bed46606b57756a9d5e Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Wed, 21 Aug 2024 18:13:55 +0900 Subject: [PATCH 1/5] =?UTF-8?q?RequestMapping=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/canvasStatus/CanvasStatusController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 92480c01..fc33e34e 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusController.java @@ -26,7 +26,7 @@ public class CanvasStatusController { } @Operation(description = "견적서를 조회 한다.") - @GetMapping("/canvas-statuses/{objectNo}") + @GetMapping("/canvas-statuses/by-object/{objectNo}") public List selectObjectNoCanvasStatus(@PathVariable String objectNo) { return canvasStatusService.selectObjectNoCanvasStatus(objectNo); } @@ -45,7 +45,7 @@ public class CanvasStatusController { } @Operation(description = "견적서를 삭제 한다.") - @DeleteMapping("/canvas-statuses/{objectNo}") + @DeleteMapping("/canvas-statuses/by-object/{objectNo}") @ResponseStatus(HttpStatus.NO_CONTENT) public void deleteObjectNoCanvasStatus(@PathVariable String objectNo) { canvasStatusService.deleteObjectNoCanvasStatus(objectNo); From 32da841facb275ee6619ea200deb5651e3a72895 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Thu, 22 Aug 2024 10:12:33 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=EB=93=B1?= =?UTF-8?q?=EB=A1=9DAPI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/canvasStatus/CanvasStatusMapper.java | 4 ++-- .../biz/canvasStatus/CanvasStatusService.java | 16 ++++++++-------- .../mappers/canvasStatus/canvasStatusMapper.xml | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) 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 c00dc9ca..9550b89a 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java @@ -11,10 +11,10 @@ import org.apache.ibatis.annotations.Mapper; public interface CanvasStatusMapper { // objectNo 생성 - public String getCanvasStatusNewObjectNo(String userId); + public CanvasStatus getCanvasStatusNewObjectNo(String userId); // imageName 생성 - public String getCanvasStatusImageAdd(String objectNo); + public CanvasStatus getCanvasStatusImageAdd(String objectNo); // 전체 견적서 조회 public List selectAllCanvasStatus(String userId); 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 0cedab71..44834e6d 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java @@ -27,22 +27,22 @@ public class CanvasStatusService { // 견적서 등록 public String insertCanvasStatus(CanvasStatus cs) { - + try { // objectNo 없음(신규) - if (cs.getObjectNo() == null) { + if (cs.getObjectNo() == null || cs.getObjectNo() == "") { // objectNo 생성 - String objectNo = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId()); - - cs.setObjectNo(objectNo); + CanvasStatus newTemp = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId()); + + cs.setObjectNo(newTemp.getObjectNo()); cs.setImageName("image01"); // 이미지(템플릿) 등록(추가) } else { // imageName 생성 - String imageName = canvasStatusMapper.getCanvasStatusImageAdd(cs.getObjectNo()); - - cs.setImageName(imageName); + CanvasStatus addTemp = canvasStatusMapper.getCanvasStatusImageAdd(cs.getObjectNo()); + + cs.setImageName(addTemp.getImageName()); } canvasStatusMapper.insertCanvasStatus(cs); diff --git a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml index 2c10b9bd..eb7e313f 100644 --- a/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml +++ b/src/main/resources/mappers/canvasStatus/canvasStatusMapper.xml @@ -6,7 +6,7 @@ @@ -14,7 +14,7 @@ From f764c54dbed8a6ae7620f4cd9146390506b92423 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Thu, 22 Aug 2024 13:47:46 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=EB=93=B1?= =?UTF-8?q?=EB=A1=9DAPI=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/canvasStatus/CanvasStatusService.java | 9 --------- 1 file changed, 9 deletions(-) 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 44834e6d..2986c246 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java @@ -33,16 +33,7 @@ public class CanvasStatusService { if (cs.getObjectNo() == null || cs.getObjectNo() == "") { // objectNo 생성 CanvasStatus newTemp = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId()); - cs.setObjectNo(newTemp.getObjectNo()); - cs.setImageName("image01"); - - // 이미지(템플릿) 등록(추가) - } else { - // imageName 생성 - CanvasStatus addTemp = canvasStatusMapper.getCanvasStatusImageAdd(cs.getObjectNo()); - - cs.setImageName(addTemp.getImageName()); } canvasStatusMapper.insertCanvasStatus(cs); From fa57b08f082d12f14a5f1cd4d4bc8cde881ac4d5 Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Thu, 22 Aug 2024 13:53:16 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=EB=93=B1?= =?UTF-8?q?=EB=A1=9DAPI=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../interplug/qcast/biz/canvasStatus/CanvasStatusService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2986c246..3e2e1ad1 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java @@ -30,7 +30,7 @@ public class CanvasStatusService { try { // objectNo 없음(신규) - if (cs.getObjectNo() == null || cs.getObjectNo() == "") { + if (cs.getObjectNo() == null || cs.getObjectNo().isEmpty()) { // objectNo 생성 CanvasStatus newTemp = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId()); cs.setObjectNo(newTemp.getObjectNo()); From 59257c2ee349f346dbbd56c6bb6957306febde9c Mon Sep 17 00:00:00 2001 From: changkyu choi Date: Thu, 22 Aug 2024 14:11:38 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=EB=93=B1?= =?UTF-8?q?=EB=A1=9DAPI=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95(?= =?UTF-8?q?=EB=8B=A4=EC=8B=9C)=20objectNo=20=ED=99=94=EB=A9=B4=EC=97=90?= =?UTF-8?q?=EC=84=9C=20Get?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/canvasStatus/CanvasStatusMapper.java | 4 +- .../biz/canvasStatus/CanvasStatusService.java | 61 +++++++------------ 2 files changed, 24 insertions(+), 41 deletions(-) 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 9550b89a..58200ddf 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusMapper.java @@ -10,10 +10,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CanvasStatusMapper { - // objectNo 생성 + // objectNo 생성(미사용) public CanvasStatus getCanvasStatusNewObjectNo(String userId); - // imageName 생성 + // imageName 생성(미사용) public CanvasStatus getCanvasStatusImageAdd(String objectNo); // 전체 견적서 조회 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 0cedab71..c1212161 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java +++ b/src/main/java/com/interplug/qcast/biz/canvasStatus/CanvasStatusService.java @@ -13,13 +13,13 @@ import org.springframework.stereotype.Service; @RequiredArgsConstructor public class CanvasStatusService { // @Autowired CanvasStatusMapper canvasStatusMapper; - private final CanvasStatusMapper canvasStatusMapper; + private final CanvasStatusMapper canvasStatusMapper; - // 전체 견적서 조회 + // 전체 견적서 조회 public List selectAllCanvasStatus(String userId) { return canvasStatusMapper.selectAllCanvasStatus(userId); } - + // 견적서 조회(objectNo) public List selectObjectNoCanvasStatus(String objectNo) { return canvasStatusMapper.selectObjectNoCanvasStatus(objectNo); @@ -27,48 +27,31 @@ public class CanvasStatusService { // 견적서 등록 public String insertCanvasStatus(CanvasStatus cs) { - - try { - // objectNo 없음(신규) - if (cs.getObjectNo() == null) { - // objectNo 생성 - String objectNo = canvasStatusMapper.getCanvasStatusNewObjectNo(cs.getUserId()); - - cs.setObjectNo(objectNo); - cs.setImageName("image01"); - - // 이미지(템플릿) 등록(추가) - } else { - // imageName 생성 - String imageName = canvasStatusMapper.getCanvasStatusImageAdd(cs.getObjectNo()); - - cs.setImageName(imageName); - } - + + try { canvasStatusMapper.insertCanvasStatus(cs); - } catch (Exception e) { System.out.println("오류 발생 : " + e.getMessage()); - } - + } + // 생성된 objectNo 반환 - return cs.getObjectNo(); - - } + return cs.getObjectNo(); + + } // 견적서 수정 - public void updateCanvasStatus(CanvasStatus cs) { - canvasStatusMapper.updateCanvasStatus(cs); - } + public void updateCanvasStatus(CanvasStatus cs) { + canvasStatusMapper.updateCanvasStatus(cs); + } // 견적서 삭제 - public void deleteObjectNoCanvasStatus(String objectNo) { - canvasStatusMapper.deleteObjectNoCanvasStatus(objectNo); - } - - // 이미지(템플릿) 삭제 - public void deleteImageNameCanvasStatus(Integer id) { - canvasStatusMapper.deleteImageNameCanvasStatus(id); - } - + public void deleteObjectNoCanvasStatus(String objectNo) { + canvasStatusMapper.deleteObjectNoCanvasStatus(objectNo); + } + + // 이미지(템플릿) 삭제 + public void deleteImageNameCanvasStatus(Integer id) { + canvasStatusMapper.deleteImageNameCanvasStatus(id); + } + }