From d5f9e7242f009a79717e29a7f44738b9b88c91eb Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Mon, 13 Jan 2025 13:14:47 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=97=86?=
 =?UTF-8?q?=EC=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/api/worddictController.java    | 20 +++++++----
 .../localhost/mapper/worddictyMapper.java     |  2 ++
 .../localhost/service/worddictyService.java   | 13 ++++---
 src/main/resources/mapper/worddictyMapper.xml | 36 +++++++++++--------
 4 files changed, 47 insertions(+), 24 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 d99daed..9918bde 100644
--- a/src/main/java/io/company/localhost/controller/api/worddictController.java
+++ b/src/main/java/io/company/localhost/controller/api/worddictController.java
@@ -14,7 +14,9 @@
  *************************************************************/
 package io.company.localhost.controller.api;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -54,10 +56,17 @@ public class worddictController {
 	@Member
 	@ParameterCheck
 	@GetMapping("getWordList")
-	 public ApiResponse<PageInfo<MapDto>> getWordList(@ReqMap MapDto map) {
-        PageInfo<MapDto> WordList = worddictyservice.getWordList(map); 
-        return ApiResponse.ok(WordList); 
-    }
+	public ApiResponse<MapDto> getWordList(@ReqMap MapDto map) {
+	    int total = worddictyservice.getTotal(map); 
+	    List<MapDto> wordList = worddictyservice.getWordList(map);
+
+	    MapDto OutData = new MapDto();
+	    OutData.put("total", total);
+	    OutData.put("data", wordList);
+
+	    return ApiResponse.ok(OutData); 
+	}
+
     /**
      * 용어집 카테고리 목록 
      * @param 
@@ -105,6 +114,7 @@ public class worddictController {
 
 		//userId
 		Long userId = AuthUtil.getUser().getId();
+		 String content = map.getString("content");  // content 추출
 		//map.put("userId", userId);
 		/////////로그인 미개발 ->임시
 		map.put("userId", 1); 
@@ -131,6 +141,4 @@ public class worddictController {
 		
 	    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 77ee375..369be30 100644
--- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java
+++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java
@@ -31,6 +31,8 @@ public interface worddictyMapper {
 
 	MapDto getWordDetail(MapDto map);
 
+	int getTotal(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 ad8a8fc..ffe3ea8 100644
--- a/src/main/java/io/company/localhost/service/worddictyService.java
+++ b/src/main/java/io/company/localhost/service/worddictyService.java
@@ -15,6 +15,8 @@
 package io.company.localhost.service;
 
 
+import java.util.List;
+
 import org.springframework.stereotype.Service;
 
 import com.github.pagehelper.PageHelper;
@@ -31,10 +33,9 @@ public class worddictyService {
 	
 	private final worddictyMapper worddictymapper;
 
-	public PageInfo<MapDto> getWordList(MapDto map) {
-		int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1;
-		PageHelper.startPage(page, 10);		
-        return PageUtil.redefineNavigation(new PageInfo<>(worddictymapper.getWordList(map),10));
+	public List<MapDto> getWordList(MapDto map) {
+
+        return (worddictymapper.getWordList(map));
 	}
 
 	public Long insertWord(MapDto map) {
@@ -49,6 +50,10 @@ public class worddictyService {
 		return worddictymapper.getWordDetail(map);
 	}
 
+	public int getTotal(MapDto map) {
+		return worddictymapper.getTotal(map);
+	}
+
 
 
 
diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml
index 7aa13e2..6de1b79 100644
--- a/src/main/resources/mapper/worddictyMapper.xml
+++ b/src/main/resources/mapper/worddictyMapper.xml
@@ -1,22 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="io.company.localhost.mapper.worddictyMapper">
-	<select id="getWordList" parameterType="map" resultType="Map">
- 		select 
-			w.*
-	     	,c.CMNCODNAM category
-	    from 
-	        worddicty w
-	    left join 
-	    	commoncod c
-	    on 
-	    	w.WRDDICCAT = c.CMNCODVAL 
-	    where 
-	        1=1
-        <!-- 검색어 조건 -->
+  <sql id="searchConditions">
+      <!-- 검색어 조건 -->
         <if test="searchKeyword != null and searchKeyword != ''">
             and (w.WRDDICTTL like CONCAT('%', #{searchKeyword}, '%')
-                 or w.WRDDICCON like CONCAT('%', #{searchKeyword}, '%'))
+             	or w.WRDDICCON like CONCAT('%', #{searchKeyword}, '%'))
         </if>
         <!-- 색인표 조건 -->
         <if test="indexKeyword != null and indexKeyword != ''">
@@ -149,8 +138,27 @@
         <if test="category != null and category != ''">
             and w.WRDDICCAT = #{category}
         </if>
+  </sql>
+	<select id="getWordList" parameterType="map" resultType="Map">
+ 		select 
+			w.*
+	     	,c.CMNCODNAM category
+	    from 
+	        worddicty w
+	    left join 
+	    	commoncod c
+	    on 
+	    	w.WRDDICCAT = c.CMNCODVAL 
+	    where 
+	        1=1
+      	<include refid="searchConditions"/>
 	     order by w.WRDDICRDT desc
 	</select>
+	<select id="getTotal" parameterType="map" >
+	select count(*) from worddicty w
+	where 1=1
+	  <include refid="searchConditions"/>
+	</select>
 	<insert id="insertWord" parameterType="map">
 		insert into worddicty
 			(