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 13071ea..8e390ec 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -54,6 +54,7 @@ public class worddictController { @GetMapping("getWordList") public ApiResponse getWordList(@ReqMap MapDto map) { int total = worddictyservice.getTotal(map); + List wordList = worddictyservice.getWordList(map); MapDto OutData = new MapDto(); diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index 369be30..bf48d4c 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -15,6 +15,7 @@ package io.company.localhost.mapper; import java.util.List; +import java.util.Map; import org.apache.ibatis.annotations.Mapper; @@ -23,7 +24,7 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface worddictyMapper { - List getWordList(MapDto map); + List getWordList(Map 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 e0b533b..fd81034 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -15,7 +15,10 @@ 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; @@ -29,11 +32,34 @@ public class worddictyService { private final worddictyMapper worddictymapper; - public List getWordList(MapDto map) { + public List> getWordList(Map map) { + List wordList = worddictymapper.getWordList(map); + List> processedList = new ArrayList<>(); - return (worddictymapper.getWordList(map)); + //데이터 가공 + for (Map dto : wordList) { + Map author = new HashMap<>(); + 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<>(); + lastEditor.put("profileImage", dto.remove("UPDPRF")); + lastEditor.put("name", dto.remove("UPDNAME")); + lastEditor.put("color", dto.remove("UPDCOLOR")); + lastEditor.put("updatedAt", dto.remove("UPDUDT")); + + dto.put("author", author); + dto.put("lastEditor", lastEditor); + + processedList.add(dto); + } + return processedList; } + + public Long insertWord(MapDto map) { return worddictymapper.insertWord(map); } diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml index 6de1b79..0bea471 100644 --- a/src/main/resources/mapper/worddictyMapper.xml +++ b/src/main/resources/mapper/worddictyMapper.xml @@ -141,16 +141,43 @@