yumeng 1 year ago
parent
commit
2dc62459d6

+ 4 - 6
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/controller/JyMaterialListController.java

@@ -43,12 +43,6 @@ public class JyMaterialListController extends BaseController {
     @Autowired
     @Autowired
     private IJyMaterialListService jyMaterialListService;
     private IJyMaterialListService jyMaterialListService;
 
 
-    @GetMapping("/getKeyWordList")
-    public TableDataInfo getKeyWordList() {
-        startPage();
-        List<JSONObject> list = jyMaterialListService.getKeyWordList();
-        return getDataTable(list);
-    }
 
 
     @GetMapping("/insertKeyWord")
     @GetMapping("/insertKeyWord")
     public JSONObject insertKeyWord(String type, String keyWord) {
     public JSONObject insertKeyWord(String type, String keyWord) {
@@ -129,6 +123,10 @@ public class JyMaterialListController extends BaseController {
         return jyMaterialListService.selectJyMaterialListList(jyMaterialList);
         return jyMaterialListService.selectJyMaterialListList(jyMaterialList);
     }
     }
 
 
+    @GetMapping("/getKeyWordList")
+    public PageInfo<JSONObject> getKeyWordList(String pageNum, String pageSize) {
+        return jyMaterialListService.getKeyWordList(Integer.valueOf(pageNum), Integer.valueOf(pageSize));
+    }
 
 
     /**
     /**
      * 修改素材信息
      * 修改素材信息

+ 2 - 1
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/mapper/JyMaterialListMapper.java

@@ -3,6 +3,7 @@ package com.ruixuan.jiaoyang.mapper;
 
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.ruixuan.jiaoyang.entity.JyMaterialList;
 import com.ruixuan.jiaoyang.entity.JyMaterialList;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
 import java.util.List;
 
 
@@ -70,5 +71,5 @@ public interface JyMaterialListMapper
 
 
     List<JSONObject> getKeyWordList();
     List<JSONObject> getKeyWordList();
 
 
-    void insertKeyWord(String type, String keyWord);
+    void insertKeyWord(@Param("type") String type, @Param("keyWord") String keyWord);
 }
 }

+ 1 - 1
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/IJyMaterialListService.java

@@ -68,7 +68,7 @@ public interface IJyMaterialListService
 
 
     void addMaterials(Long userId, String userName, JSONArray materialList);
     void addMaterials(Long userId, String userName, JSONArray materialList);
 
 
-    List<JSONObject> getKeyWordList();
+    PageInfo<JSONObject> getKeyWordList(Integer pageNum,Integer pageSize);
 
 
     void insertKeyWord(String type, String keyWord);
     void insertKeyWord(String type, String keyWord);
 }
 }

+ 11 - 5
ruixuan-live/src/main/java/com/ruixuan/jiaoyang/service/impl/JyMaterialListServiceImpl.java

@@ -67,6 +67,15 @@ public class JyMaterialListServiceImpl implements IJyMaterialListService {
         return pageInfo;
         return pageInfo;
     }
     }
 
 
+    @Override
+    public PageInfo<JSONObject> getKeyWordList(Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<JSONObject> list = jyMaterialListMapper.getKeyWordList();
+        PageInfo<JSONObject> pageInfo = new PageInfo<>(list);
+        return pageInfo;
+    }
+
+
     /**
     /**
      * 新增素材信息
      * 新增素材信息
      *
      *
@@ -151,14 +160,11 @@ public class JyMaterialListServiceImpl implements IJyMaterialListService {
         }
         }
     }
     }
 
 
-    @Override
-    public List<JSONObject> getKeyWordList() {
-        return jyMaterialListMapper.getKeyWordList();
-    }
+
 
 
     @Override
     @Override
     public void insertKeyWord(String type, String keyWord) {
     public void insertKeyWord(String type, String keyWord) {
-        jyMaterialListMapper.insertKeyWord(type,keyWord);
+        jyMaterialListMapper.insertKeyWord(type, keyWord);
         keyList = new ArrayList<>();
         keyList = new ArrayList<>();
     }
     }
 
 

+ 1 - 1
ruixuan-live/src/main/resources/mapper/jiaoyang/JyMaterialListMapper.xml

@@ -56,7 +56,7 @@
         select  type as 'type',key_word as 'keyWord'  from sensitive_key_word
         select  type as 'type',key_word as 'keyWord'  from sensitive_key_word
     </select>
     </select>
     <select id="getKeyWordList" resultType="com.alibaba.fastjson.JSONObject">
     <select id="getKeyWordList" resultType="com.alibaba.fastjson.JSONObject">
-        select  *  from  sensitive_key_word  group by key_word  order by `type`
+        select  *  from  sensitive_key_word
     </select>
     </select>
 
 
     <insert id="insertJyMaterialList" parameterType="com.ruixuan.jiaoyang.entity.JyMaterialList" useGeneratedKeys="true"
     <insert id="insertJyMaterialList" parameterType="com.ruixuan.jiaoyang.entity.JyMaterialList" useGeneratedKeys="true"