From dfca1a9ee2758cb1fe1895a00d8fbb958defeaa2 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Mon, 17 Mar 2025 10:54:42 +0900 Subject: [PATCH] =?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/worddictController.java | 11 +++++------ .../localhost/mapper/VotDetailMapper.java | 14 ++++++++++++++ .../localhost/mapper/VotMemberMapper.java | 18 ++++++++++++++---- .../localhost/mapper/VotRecordMapper.java | 14 ++++++++++++++ .../localhost/mapper/VotchoiceMapper.java | 15 ++++++++++++++- .../localhost/mapper/localvoteMapper.java | 14 ++++++++++++++ .../localhost/mapper/worddictyMapper.java | 4 ++-- .../localhost/service/localvoteService.java | 16 +++++++++++++++- .../localhost/service/worddictyService.java | 8 ++++---- 9 files changed, 96 insertions(+), 18 deletions(-) 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 a808e0d..7e454ff 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -53,10 +53,10 @@ public class worddictController { @Member @ParameterCheck @GetMapping("getWordList") - public ApiResponse getWordList(@ReqMap MapDto map) { + public ApiResponse selectWordList(@ReqMap MapDto map) { int total = worddictyservice.getTotal(map); - List wordList = worddictyservice.getWordList(map); + List wordList = worddictyservice.selectWordList(map); MapDto OutData = new MapDto(); OutData.put("total", total); @@ -73,7 +73,7 @@ public class worddictController { @Member @ParameterCheck @GetMapping("getWordCategory") - public ApiResponse> getWordCategory() { + public ApiResponse> selectWordCategory() { List WordCategoryList = commoncodservice.selectWordCategory(); return ApiResponse.ok(WordCategoryList); } @@ -97,8 +97,8 @@ public class worddictController { @Member @ParameterCheck @GetMapping("getWordDetail") - public ApiResponse getWordDetail(@ReqMap MapDto map) { - return ApiResponse.ok( worddictyservice.getWordDetail(map)); + public ApiResponse selectWordDetail(@ReqMap MapDto map) { + return ApiResponse.ok( worddictyservice.selectWordDetail(map)); } /** * 용어 등록 - 카테고리 등록 @@ -125,7 +125,6 @@ public class worddictController { @PatchMapping("updateWord") public ApiResponse updateWord(@ReqMap MapDto map) { - //userId Long userId = AuthUtil.getUser().getId(); map.put("userId", userId); Long result = worddictyservice.updateWord(map); diff --git a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java index f3bafdc..3321b4c 100644 --- a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotDetailMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import java.util.List; diff --git a/src/main/java/io/company/localhost/mapper/VotMemberMapper.java b/src/main/java/io/company/localhost/mapper/VotMemberMapper.java index 7879e48..78f1240 100644 --- a/src/main/java/io/company/localhost/mapper/VotMemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotMemberMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotMemberMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import java.util.List; @@ -13,8 +27,4 @@ public interface VotMemberMapper { List selectVoteMember(Integer locvotSeq); - - - - } diff --git a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java index 7f07618..9669872 100644 --- a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotRecordMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java index b0940bf..4e64b89 100644 --- a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotchoiceMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import org.apache.ibatis.annotations.Mapper; @@ -9,5 +23,4 @@ public interface VotchoiceMapper { void insertChoice(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 fb3b4bc..99557f4 100644 --- a/src/main/java/io/company/localhost/mapper/localvoteMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvoteMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : localvoteMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import java.util.List; diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index 4792329..aeb287a 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -23,13 +23,13 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface worddictyMapper { - List getWordList(MapDto map); + List selectWordList(MapDto map); Long insertWord(MapDto map); Long updateWord(MapDto map); - MapDto getWordDetail(MapDto map); + MapDto selectWordDetail(MapDto map); int getTotal(MapDto map); diff --git a/src/main/java/io/company/localhost/service/localvoteService.java b/src/main/java/io/company/localhost/service/localvoteService.java index cbcc217..7b78af2 100644 --- a/src/main/java/io/company/localhost/service/localvoteService.java +++ b/src/main/java/io/company/localhost/service/localvoteService.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.service + * @fileName : localvoteService.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.service; import java.util.ArrayList; @@ -63,8 +77,8 @@ public class localvoteService { MapDto voteMap = new MapDto(); voteMap.put("localVote", vote); Integer locvotSeq = (Integer) vote.get("LOCVOTSEQ"); - //투표 항목조회 + 결과 조회 + 투표여부 map.put("locvotSeq", locvotSeq); + //투표 항목조회 + 결과 조회 + 투표여부 List voteDetails = votdetailmapper.selectVoteDetailsResult(map); //투표 가능 멤버 조회 List voteMembers = votmembermapper.selectVoteMember(locvotSeq); diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index bc33b7a..da9241b 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -33,8 +33,8 @@ public class worddictyService { private final worddictyMapper worddictymapper; private final commoncodMapper commoncodmapper; - public List getWordList(MapDto map) { - List wordList = worddictymapper.getWordList(map); + public List selectWordList(MapDto map) { + List wordList = worddictymapper.selectWordList(map); for (MapDto word : wordList) { Object content = word.get("WRDDICCON"); // BlobUtil.procBlobToString으로 content 변환 @@ -80,8 +80,8 @@ public class worddictyService { public Long updateWord(MapDto map) { return worddictymapper.updateWord(map); } - public MapDto getWordDetail(MapDto map) { - return worddictymapper.getWordDetail(map); + public MapDto selectWordDetail(MapDto map) { + return worddictymapper.selectWordDetail(map); } public int getTotal(MapDto map) { return worddictymapper.getTotal(map);