1.3.3采美百科与词条详情功能优化

src/main/java/com/caimei/www/controller/unlimited/EncyclopediaController.java

@@ -45,7 +45,7 @@ public class EncyclopediaController extends BaseController {
         //分类集合
         List<BaikeTypeVo> TypeList = productService.geTypeList();
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords(typeId);
+        List<String> hotSeracherWords=productService.getHotWords();
         model.addAttribute("authUserList", authUserList);
         model.addAttribute("TypeList", TypeList);
         model.addAttribute("hotSeracherWords", hotSeracherWords);
@@ -59,7 +59,7 @@ public class EncyclopediaController extends BaseController {
     public String getEncyclopediaDetail(final Model model, @PathVariable("id") Integer id) {
         BaikeProductVo baikeproduct = productService.getEncyclopediaDetail(id);
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords(null);
+        List<String> hotSeracherWords=productService.getHotWords();
         model.addAttribute("hotSeracherWords", hotSeracherWords);
         model.addAttribute("baikeproduct", baikeproduct);
         return ENCYCLOPEDIA_DETAIL;
@@ -71,7 +71,7 @@ public class EncyclopediaController extends BaseController {
     @GetMapping("/search.html")
     public String getEncyclopediaSearch(final Model model) {
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords(null);
+        List<String> hotSeracherWords=productService.getHotWords();
         model.addAttribute("hotSeracherWords", hotSeracherWords);
         return ENCYCLOPEDIA_SEARCH;
     }
@@ -82,7 +82,7 @@ public class EncyclopediaController extends BaseController {
     @GetMapping("/about.html")
     public String getEncyclopediaAbout(final Model model) {
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords(null);
+        List<String> hotSeracherWords=productService.getHotWords();
         model.addAttribute("hotSeracherWords", hotSeracherWords);
         return ENCYCLOPEDIA_ABOUT;
     }

src/main/java/com/caimei/www/mapper/BaikeDao.java

@@ -45,7 +45,7 @@ public interface BaikeDao {
 
     List<BaikeProductVo> getAuthUserList(Integer typeId);
 
-    List<String> getHotWords(Integer typeId);
+    List<String> getHotWords();
 
 
     BaikeProductVo getEntryInfoById(Integer id);

src/main/java/com/caimei/www/pojo/baike/BaikeHotSearch.java

@@ -3,6 +3,7 @@ package com.caimei.www.pojo.baike;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * Description
@@ -28,4 +29,22 @@ public class BaikeHotSearch implements Serializable {
      * 跳转链接
      */
     private String jumpLink;
+
+    private Integer id;
+    /**
+     * 排序值
+     */
+    private Integer sort;
+    /**
+     * 状态
+     */
+    private Integer status;
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+    /**
+     * 添加人
+     */
+    private String addBy;
 }

src/main/java/com/caimei/www/pojo/baike/BaikeTypeVo.java

@@ -18,5 +18,7 @@ public class BaikeTypeVo implements Serializable {
     private Integer typeId;
     private String name;
     private List<BaikeProductVo> productList;
-
+    private String pcBanner;
+    private String appBanner;
+    private String bannerLink;
 }

src/main/java/com/caimei/www/service/page/ProductService.java

@@ -108,7 +108,7 @@ public interface ProductService {
 
     List<BaikeProductVo> getAuthUserList(Integer typeId);
 
-    List<String> getHotWords(Integer typeId);
+    List<String> getHotWords();
 
 
     BaikeProductVo getEncyclopediaDetail(Integer id);

src/main/java/com/caimei/www/service/page/impl/ProductServiceImpl.java

@@ -351,8 +351,8 @@ public class ProductServiceImpl implements ProductService {
      * @return
      */
     @Override
-    public List<String> getHotWords(Integer typeId){
-        List<String> authUserList = baikeDao.getHotWords(typeId);
+    public List<String> getHotWords(){
+        List<String> authUserList = baikeDao.getHotWords();
         return authUserList;
     }
 

src/main/resources/mapper/BaikeMapper.xml

@@ -120,14 +120,15 @@
 
 	<select id="getHotWords" resultType="java.lang.String">
 		select
-			p.name
-		from cm_baike_product p
-				 left join cm_baike_type t on p.typeId=t.id
-		where
-		<if test="null != typeId and '' !=typeId">
-			p.typeId =#{typeId}
-		</if>
-		order by p.actualPv desc limit 10
+			p.id,
+			p.keyWord,
+			p.jumpType,
+			p.jumpLink,
+			p.sort,
+			p.status,
+			p.addTime,
+			p.addBy
+		from cm_baike_hot_search p
 	</select>
 
 	<select id="getEntryInfoById" resultType="com.caimei.www.pojo.baike.BaikeProductVo">
@@ -200,6 +201,7 @@
 	</select>
 
 	<select id="geTypeList"  resultType="com.caimei.www.pojo.baike.BaikeTypeVo">
-		select  id as typeId,name from cm_baike_type
+		select  id as typeId,name,pcBanner,appBanner,bannerLink from cm_baike_type
+		where status=1
 	</select>
 </mapper>