Merge branch 'khj' into main

src/main/java/io/company/localhost/controller/api/worddictController.java

@@ -54,6 +54,7 @@ public class worddictController {
 	@GetMapping("getWordList")
 	public ApiResponse<MapDto> getWordList(@ReqMap MapDto map) {
 	    int total = worddictyservice.getTotal(map); 
+	    
 	    List<MapDto> wordList = worddictyservice.getWordList(map);
 
 	    MapDto OutData = new MapDto();

src/main/java/io/company/localhost/controller/common/ImageUploadController.java

@@ -46,6 +46,11 @@ public class ImageUploadController {
     @Value("${filePath.boardfile}")
     private String boardFilePath;
 
+    /**
+     * 에디터 내 이미지 업로드 
+     * @form-data file 업로드할 파일실제경로/파일이름
+     * @return
+     */
 	@ParameterCheck
     @PostMapping("/upload")
     public ApiResponse<String> uploadImage(@RequestParam("file") MultipartFile file) throws IOException {

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<MapDto> getWordList(MapDto map);
+	List<MapDto> getWordList(Map<String, Object> map);
 
 	Long insertWord(MapDto map);
 

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,10 +32,33 @@ public class worddictyService {
 	
 	private final worddictyMapper worddictymapper;
 
-	public List<MapDto> getWordList(MapDto map) {
+	public List<Map<String, Object>> getWordList(Map<String, Object> map) {
+	    List<MapDto> wordList = worddictymapper.getWordList(map);
+	    List<Map<String, Object>> processedList = new ArrayList<>();
 
-        return (worddictymapper.getWordList(map));
+	    //데이터 가공
+	    for (Map<String, Object> dto : wordList) {
+	        Map<String, Object> 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<String, Object> 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);

src/main/resources/mapper/worddictyMapper.xml

@@ -141,14 +141,41 @@
   </sql>
 	<select id="getWordList" parameterType="map" resultType="Map">
  		select 
-			w.*
-	     	,c.CMNCODNAM category
+		    w.WRDDICSEQ,
+		    w.WRDDICCAT,
+		    w.WRDDICTTL,
+		    w.WRDDICCON,
+		    c.CMNCODNAM category,
+		    m1.MEMBERPRF REGPRF,
+		    m1.MEMBERNAM REGNAME,
+		    cr.CMNCODNAM REGCOLOR, 
+		    w.WRDDICRDT REGRDT,
+		    m2.MEMBERPRF UPDPRF,
+		    m2.MEMBERNAM UPDNAME,
+		    cu.CMNCODNAM UPDCOLOR, 
+		    w.WRDDICUDT UPDUDT
 		from 
 		    worddicty w
 		left join 
 		    commoncod c
 		on 
 		    w.WRDDICCAT = c.CMNCODVAL
+		left join 
+		    netmember m1
+		on 
+		    w.WRDDICREG = m1.MEMBERSEQ
+		left join 
+		    commoncod cr
+		on 
+		    m1.MEMBERCOL = cr.CMNCODVAL -- 등록자 색상
+		left join 
+		    netmember m2
+		on 
+		    w.WRDDICUPD = m2.MEMBERSEQ
+		left join 
+		    commoncod cu
+		on 
+		    m2.MEMBERCOL = cu.CMNCODVAL -- 수정자 색상
 		where 
 		    1=1
       	<include refid="searchConditions"/>