From 96c5a349c74856daedb946f41c78b08f8250fec2 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Thu, 20 Feb 2025 11:11:53 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=84=B1=EA=B3=B5=EC=8B=9C=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=EB=A7=8C=20=EB=B0=98=ED=99=98=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/company/localhost/common/dto/ApiResponse.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/io/company/localhost/common/dto/ApiResponse.java b/src/main/java/io/company/localhost/common/dto/ApiResponse.java index 920e105..8919aa2 100644 --- a/src/main/java/io/company/localhost/common/dto/ApiResponse.java +++ b/src/main/java/io/company/localhost/common/dto/ApiResponse.java @@ -47,4 +47,7 @@ public class ApiResponse { public static ApiResponse error(HttpStatus status, String message) { return new ApiResponse<>(status, message, null); } + public static ApiResponse okMessage(String message) { + return new ApiResponse<>(HttpStatus.OK, message, null); + } } \ No newline at end of file From 68b8a26322bded4baf2fb9d63461a8e118683dee Mon Sep 17 00:00:00 2001 From: khj0414 Date: Thu, 20 Feb 2025 11:16:48 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/VoteBoardController.java | 15 ++++++++++ .../controller/api/worddictController.java | 17 +++++++++++ .../common/ImageUploadController.java | 2 +- .../localhost/mapper/commoncodMapper.java | 2 ++ .../localhost/mapper/localvoteMapper.java | 2 ++ .../localhost/mapper/worddictyMapper.java | 2 ++ .../localhost/service/commoncodService.java | 5 ++++ .../localhost/service/localvoteService.java | 9 +++++- .../localhost/service/worddictyService.java | 7 +++-- src/main/resources/mapper/VotMemberMapper.xml | 29 +++++++++++++++---- src/main/resources/mapper/VotRecordMapper.xml | 15 ---------- src/main/resources/mapper/commoncodMapper.xml | 9 +++++- src/main/resources/mapper/localvoteMapper.xml | 14 +++++++++ src/main/resources/mapper/worddictyMapper.xml | 10 +++++++ 14 files changed, 113 insertions(+), 25 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/VoteBoardController.java b/src/main/java/io/company/localhost/controller/api/VoteBoardController.java index 13cfbb0..f33a200 100644 --- a/src/main/java/io/company/localhost/controller/api/VoteBoardController.java +++ b/src/main/java/io/company/localhost/controller/api/VoteBoardController.java @@ -2,6 +2,7 @@ package io.company.localhost.controller.api; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -76,5 +77,19 @@ public class VoteBoardController { return ApiResponse.ok(localvoteservice.insertCheckedNums(map)); } + /** + * 투표 종료 + * @param endVoteId 투표번호 + * @return + */ + @Member + @PatchMapping("updateEndData") + public ApiResponse updateEndData(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { + + Long userId = AuthUtil.getUser().getId(); + map.put("userId", userId); + return ApiResponse.ok(localvoteservice.updateEndData(map)); + } + } diff --git a/src/main/java/io/company/localhost/controller/api/worddictController.java b/src/main/java/io/company/localhost/controller/api/worddictController.java index 764588d..365139a 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -14,8 +14,10 @@ *************************************************************/ package io.company.localhost.controller.api; +//import java.util.Arrays; import java.util.List; +import org.springframework.http.HttpStatus; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; @@ -96,6 +98,9 @@ public class worddictController { @PostMapping("insertCategory") public ApiResponse insertCategory(@ReqMap MapDto map) { Long result = commoncodservice.insertCategory(map); + if(result == -1) { + return ApiResponse.okMessage("이미 존재하는 카테고리명입니다."); + } return ApiResponse.ok(result); } /** @@ -135,4 +140,16 @@ public class worddictController { return ApiResponse.ok(result); } + /** + * 용어 삭제 + * @param idList 게시판 아이디 리스트 + * @return + */ + @Member + @PatchMapping("deleteword") + public ApiResponse updateword(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { + return ApiResponse.ok(worddictyservice.updateword(map)); + } + + } diff --git a/src/main/java/io/company/localhost/controller/common/ImageUploadController.java b/src/main/java/io/company/localhost/controller/common/ImageUploadController.java index b32d3bf..b4002a3 100644 --- a/src/main/java/io/company/localhost/controller/common/ImageUploadController.java +++ b/src/main/java/io/company/localhost/controller/common/ImageUploadController.java @@ -50,7 +50,7 @@ public class ImageUploadController { */ @ParameterCheck @PostMapping("/upload") - public ApiResponse uploadImage(@RequestParam("file") MultipartFile file) throws IOException { + public ApiResponse uploadImage(@ReqMap MultipartFile file) throws IOException { if (file.isEmpty()) { return ApiResponse.error(HttpStatus.BAD_REQUEST, "File is empty"); diff --git a/src/main/java/io/company/localhost/mapper/commoncodMapper.java b/src/main/java/io/company/localhost/mapper/commoncodMapper.java index 9f255cc..00184da 100644 --- a/src/main/java/io/company/localhost/mapper/commoncodMapper.java +++ b/src/main/java/io/company/localhost/mapper/commoncodMapper.java @@ -40,4 +40,6 @@ public interface commoncodMapper { List selectYearCategories(); List selectCategories(); + + Long selectcheckCategoryExists(MapDto map); } diff --git a/src/main/java/io/company/localhost/mapper/localvoteMapper.java b/src/main/java/io/company/localhost/mapper/localvoteMapper.java index dadea29..2d93447 100644 --- a/src/main/java/io/company/localhost/mapper/localvoteMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvoteMapper.java @@ -15,5 +15,7 @@ public interface localvoteMapper { List getVoteList(MapDto map); + Long updateEndData(MapDto map); + } diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index 369be30..4360921 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -33,6 +33,8 @@ public interface worddictyMapper { int getTotal(MapDto map); + Long updateword(MapDto map); + diff --git a/src/main/java/io/company/localhost/service/commoncodService.java b/src/main/java/io/company/localhost/service/commoncodService.java index edf2cbb..06711ab 100644 --- a/src/main/java/io/company/localhost/service/commoncodService.java +++ b/src/main/java/io/company/localhost/service/commoncodService.java @@ -19,6 +19,7 @@ import java.util.List; import org.springframework.stereotype.Service; import io.company.localhost.common.dto.MapDto; +import io.company.localhost.common.exception.NotFoundHandler; import io.company.localhost.mapper.commoncodMapper; import lombok.RequiredArgsConstructor; @@ -33,6 +34,10 @@ public class commoncodService { } public Long insertCategory(MapDto map) { + Long count = commoncodmapper.selectcheckCategoryExists(map); + if(count > 0) { + return -1L; + } return commoncodmapper.insertCategory(map); } diff --git a/src/main/java/io/company/localhost/service/localvoteService.java b/src/main/java/io/company/localhost/service/localvoteService.java index cdf3ddb..e4ccbc5 100644 --- a/src/main/java/io/company/localhost/service/localvoteService.java +++ b/src/main/java/io/company/localhost/service/localvoteService.java @@ -31,7 +31,10 @@ public class localvoteService { Long result = 0L; - int voteIdInt = (int) map.get("voteId"); + int voteIdInt = 0 ; + if(map.get("voteId") != null) { + voteIdInt = (int) map.get("voteId"); + } if(voteIdInt != 0) { result = votdetailmapper.insertdetail(map); }else { @@ -87,5 +90,9 @@ public class localvoteService { return result; } + public Long updateEndData(MapDto map) { + return localvotemapper.updateEndData(map); + } + } diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index 56b131e..c19987a 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -58,8 +58,6 @@ public class worddictyService { return processedList; } - - public Long insertWord(MapDto map) { return worddictymapper.insertWord(map); } @@ -77,6 +75,11 @@ public class worddictyService { } + public Long updateword(MapDto map) { + return worddictymapper.updateword(map); + } + + diff --git a/src/main/resources/mapper/VotMemberMapper.xml b/src/main/resources/mapper/VotMemberMapper.xml index c1985a2..ef68c2f 100644 --- a/src/main/resources/mapper/VotMemberMapper.xml +++ b/src/main/resources/mapper/VotMemberMapper.xml @@ -12,11 +12,30 @@ diff --git a/src/main/resources/mapper/VotRecordMapper.xml b/src/main/resources/mapper/VotRecordMapper.xml index c18361c..8e00221 100644 --- a/src/main/resources/mapper/VotRecordMapper.xml +++ b/src/main/resources/mapper/VotRecordMapper.xml @@ -23,20 +23,5 @@ ,#{userId} ,now() ) - - - - diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml index 4e37197..d12930e 100644 --- a/src/main/resources/mapper/commoncodMapper.xml +++ b/src/main/resources/mapper/commoncodMapper.xml @@ -112,5 +112,12 @@ AND CMNCODODR != 0 - + diff --git a/src/main/resources/mapper/localvoteMapper.xml b/src/main/resources/mapper/localvoteMapper.xml index 0ae28f4..ad4af19 100644 --- a/src/main/resources/mapper/localvoteMapper.xml +++ b/src/main/resources/mapper/localvoteMapper.xml @@ -28,11 +28,25 @@ ,DATE_FORMAT(a.LOCVOTRDT, '%Y-%m-%d %H:%i') AS formatted_LOCVOTRDT ,DATE_FORMAT(a.LOCVOTEDT, '%Y-%m-%d %H:%i') AS formatted_LOCVOTEDT ,b.* + ,c.CMNCODNAM usercolor from localvote a LEFT JOIN netmember b on a.LOCVOTREG = b.MEMBERSEQ + left join + commoncod c + on + b.MEMBERCOL = c.CMNCODVAL + order by + a.LOCVOTRDT desc + + UPDATE + localvote + SET + LOCVOTDDT = now() + WHERE LOCVOTSEQ = #{endVoteId} + diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml index 91bbda7..da376f2 100644 --- a/src/main/resources/mapper/worddictyMapper.xml +++ b/src/main/resources/mapper/worddictyMapper.xml @@ -236,4 +236,14 @@ where WRDDICSEQ = #{WRDDICSEQ} + + UPDATE + worddicty + SET + WRDDICEDT = now() + WHERE WRDDICSEQ IN + + #{id} + + From 7c7ddb6eca4d3d3724f4d756b1dff4b92a7cd2dd Mon Sep 17 00:00:00 2001 From: khj0414 Date: Thu, 20 Feb 2025 11:17:20 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94import?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/company/localhost/controller/api/worddictController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/company/localhost/controller/api/worddictController.java b/src/main/java/io/company/localhost/controller/api/worddictController.java index 365139a..606710d 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -17,7 +17,6 @@ package io.company.localhost.controller.api; //import java.util.Arrays; import java.util.List; -import org.springframework.http.HttpStatus; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping;