From 275fe94c5a8b33f8d90c9a5c2d72219de2b45b77 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Fri, 7 Feb 2025 14:01:57 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9A=A9=EC=96=B4=EC=A7=91=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/worddictController.java | 12 ++++-------- .../localhost/mapper/worddictyMapper.java | 2 +- .../localhost/service/worddictyService.java | 18 ++++++++++-------- src/main/resources/mapper/worddictyMapper.xml | 2 +- 4 files changed, 16 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 8e390ec..55159bf 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -53,8 +53,8 @@ public class worddictController { @ParameterCheck @GetMapping("getWordList") public ApiResponse getWordList(@ReqMap MapDto map) { + int total = worddictyservice.getTotal(map); - List wordList = worddictyservice.getWordList(map); MapDto OutData = new MapDto(); @@ -109,10 +109,8 @@ public class worddictController { public ApiResponse insertWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { //userId - //Long userId = AuthUtil.getUser().getId(); - //map.put("userId", userId); - /////////로그인 미개발 ->임시 - map.put("userId", 1); + Long userId = AuthUtil.getUser().getId(); + map.put("userId", userId); Long result = worddictyservice.insertWord(map); return ApiResponse.ok(result); @@ -129,9 +127,7 @@ public class worddictController { //userId Long userId = AuthUtil.getUser().getId(); - //map.put("userId", userId); - ////////로그인 미개발 ->임시 - map.put("userId", 1); + map.put("userId", userId); Long result = worddictyservice.updateWord(map); return ApiResponse.ok(result); diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index bf48d4c..fca9d93 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -24,7 +24,7 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface worddictyMapper { - List getWordList(Map map); + List getWordList(MapDto map); Long insertWord(MapDto map); diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index fd81034..cf6a4c2 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -32,19 +32,19 @@ public class worddictyService { private final worddictyMapper worddictymapper; - public List> getWordList(Map map) { - List wordList = worddictymapper.getWordList(map); - List> processedList = new ArrayList<>(); + public List getWordList(MapDto map) { + List wordList = worddictymapper.getWordList(map); + List processedList = new ArrayList<>(); - //데이터 가공 - for (Map dto : wordList) { - Map author = new HashMap<>(); + // 데이터 가공 + for (MapDto dto : wordList) { + MapDto author = new MapDto(); author.put("profileImage", dto.remove("REGPRF")); author.put("name", dto.remove("REGNAME")); author.put("color", dto.remove("REGCOLOR")); author.put("createdAt", dto.remove("REGRDT")); - Map lastEditor = new HashMap<>(); + MapDto lastEditor = new MapDto(); lastEditor.put("profileImage", dto.remove("UPDPRF")); lastEditor.put("name", dto.remove("UPDNAME")); lastEditor.put("color", dto.remove("UPDCOLOR")); @@ -53,7 +53,9 @@ public class worddictyService { dto.put("author", author); dto.put("lastEditor", lastEditor); - processedList.add(dto); + MapDto processedDto = new MapDto(); + processedDto.putAll(dto); + processedList.add(processedDto); } return processedList; } diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml index 0bea471..91bbda7 100644 --- a/src/main/resources/mapper/worddictyMapper.xml +++ b/src/main/resources/mapper/worddictyMapper.xml @@ -139,7 +139,7 @@ and w.WRDDICCAT = #{category} - select w.WRDDICSEQ, w.WRDDICCAT, From 78329b050201d5daa553689dbd7ad92d6f04f2e7 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Fri, 7 Feb 2025 14:03:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=95=84=EC=9A=94=E3=85=93=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=BD=94=EB=93=9C=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/io/company/localhost/mapper/worddictyMapper.java | 1 - .../java/io/company/localhost/service/worddictyService.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index fca9d93..369be30 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -15,7 +15,6 @@ package io.company.localhost.mapper; import java.util.List; -import java.util.Map; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index cf6a4c2..56b131e 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -16,9 +16,7 @@ package io.company.localhost.service; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.springframework.stereotype.Service;