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 4e72679..a808e0d 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -31,6 +31,7 @@ import io.company.localhost.common.dto.ApiResponse; import io.company.localhost.common.dto.MapDto; import io.company.localhost.service.commoncodService; import io.company.localhost.service.worddictyService; +import io.company.localhost.utils.AuthUtil; import io.company.localhost.vo.MemberVo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -64,6 +65,18 @@ public class worddictController { return ApiResponse.ok(OutData); } + /** + * 용어집 검색정렬 목록 + * @param + * @return + */ + @Member + @ParameterCheck + @GetMapping("getWordCategory") + public ApiResponse> getWordCategory() { + List WordCategoryList = commoncodservice.selectWordCategory(); + return ApiResponse.ok(WordCategoryList); + } /** * 용어집 카테고리 목록 * @param @@ -71,10 +84,10 @@ public class worddictController { */ @Member @ParameterCheck - @GetMapping("getWordCategory") - public ApiResponse> getWordCategory() { - List WordCategoryList = commoncodservice.selectWordCategory(); - return ApiResponse.ok(WordCategoryList); + @GetMapping("getIndexCategory") + public ApiResponse> selectIndexCategory() { + List selectIndexCategory = worddictyservice.selectIndexCategory(); + return ApiResponse.ok(selectIndexCategory); } /** * 용어집 상세 조회 @@ -94,11 +107,9 @@ public class worddictController { */ @Member @PostMapping("insertWord") - public ApiResponse insertWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { - //userId - //Long userId = AuthUtil.getUser().getId(); - //임시 - int userId = 38; + public ApiResponse insertWord(@ReqMap MapDto map) { + + Long userId = AuthUtil.getUser().getId(); map.put("userId", userId); Long result = worddictyservice.insertWord(map); @@ -112,12 +123,10 @@ public class worddictController { @Member @ParameterCheck @PatchMapping("updateWord") - public ApiResponse updateWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { + public ApiResponse updateWord(@ReqMap MapDto map) { //userId - //Long userId = AuthUtil.getUser().getId(); - //임시 - int userId = 38; + Long userId = AuthUtil.getUser().getId(); map.put("userId", userId); Long result = worddictyservice.updateWord(map); diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index 4360921..4792329 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -35,10 +35,6 @@ public interface worddictyMapper { Long updateword(MapDto map); - - - - - + List selectIndexCategory(); } diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index b794b46..bc33b7a 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -67,11 +67,15 @@ public class worddictyService { return processedList; } public Long insertWord(MapDto map) { - - if (map.containsKey("CMNCODNAM") && map.get("CMNCODNAM") != null) { + Long result = 1L; + + if (map.containsKey("CMNCODNAM") && map.get("CMNCODNAM") != null && map.get("CMNCODNAM") != "") { commoncodmapper.insertCategory(map); + result = 2L; } - return worddictymapper.insertWord(map); + worddictymapper.insertWord(map); + + return result; } public Long updateWord(MapDto map) { return worddictymapper.updateWord(map); @@ -85,4 +89,7 @@ public class worddictyService { public Long updateword(MapDto map) { return worddictymapper.updateword(map); } + public List selectIndexCategory() { + return worddictymapper.selectIndexCategory(); + } } diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml index 4828422..fe296b9 100644 --- a/src/main/resources/mapper/worddictyMapper.xml +++ b/src/main/resources/mapper/worddictyMapper.xml @@ -26,7 +26,7 @@ and w.WRDDICTTL BETWEEN '라' AND '릿' - and w.WRDDICTTL BETWEEN '마' AND '맇' + and w.WRDDICTTL BETWEEN '마' AND '밓' and w.WRDDICTTL BETWEEN '바' AND '빟' @@ -249,4 +249,97 @@ #{id} +