bugfix

backup.sql

@@ -214,4 +214,10 @@ CREATE TABLE `cm_baike_product_image` (
     `image` TEXT NULL COMMENT '图片',
     PRIMARY KEY (`id`));
 
+CREATE TABLE `cm_baike_product_question` (
+    `id` int NOT NULL AUTO_INCREMENT,
+    `productId` int DEFAULT NULL COMMENT '产品/仪器id',
+    `question` varchar(150) COMMENT '问题',
+    `answer` varchar(45) COMMENT '答案',
+    PRIMARY KEY (`id`))
 -- =================================== 2021年11月 采美百科 end =====================================

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

@@ -3,6 +3,7 @@ package com.caimei.www.controller.unlimited;
 import com.alibaba.fastjson.JSONArray;
 import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
+import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeProduct;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.ImageLink;
@@ -55,7 +56,7 @@ public class EncyclopediaController extends BaseController {
     public String getProductList(final Model model) {
         Integer commodityType = 1;
         // 搜索热门关键字
-        List<String> searchHotWord = baseService.getBaikeSearchHotWord();
+        List<BaikeHotSearch> searchHotWord = baseService.getBaikeSearchHotWord();
         model.addAttribute("searchHotWord", searchHotWord);
         // banner图
         ImageLink banner = baseService.getBaikeBannerImage(commodityType);
@@ -89,7 +90,7 @@ public class EncyclopediaController extends BaseController {
     public String getInstrumentList(final Model model) {
         Integer commodityType = 2;
         // 搜索热门关键字
-        List<String> searchHotWord = baseService.getBaikeSearchHotWord();
+        List<BaikeHotSearch> searchHotWord = baseService.getBaikeSearchHotWord();
         model.addAttribute("searchHotWord", searchHotWord);
         // banner图
         ImageLink banner = baseService.getBaikeBannerImage(commodityType);

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

@@ -1,5 +1,6 @@
 package com.caimei.www.mapper;
 
+import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -45,8 +46,9 @@ public interface BaseDao {
 
     /**
      * 采美百科搜索关键词
+     * @return
      */
-    List<String> getBaikeSearchHotWord();
+    List<BaikeHotSearch> getBaikeSearchHotWord();
 
     /**
      * 采美百科banner图

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

@@ -0,0 +1,31 @@
+package com.caimei.www.pojo.baike;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Aslee
+ * @date : 2020/11/30
+ */
+@Data
+public class BaikeHotSearch implements Serializable {
+    /**
+     * 热搜关键词
+     */
+    private String keyWord;
+    /**
+     * 跳转方式：1仅搜索，2产品，3仪器，4链接
+     */
+    private Integer jumpType;
+    /**
+     * 跳转商品id
+     */
+    private Integer productId;
+    /**
+     * 跳转链接
+     */
+    private String jumpLink;
+}

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

@@ -13,6 +13,12 @@ import java.util.List;
  */
 @Data
 public class BaikeType implements Serializable {
+    /**
+     * 分类id
+     */
     private Integer typeId;
+    /**
+     * 分类名称
+     */
     private String name;
 }

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

@@ -1,6 +1,7 @@
 package com.caimei.www.service.page;
 
 import com.alibaba.fastjson.JSONObject;
+import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.BaseLink;
 import com.caimei.www.pojo.page.ImageLink;
@@ -44,7 +45,7 @@ public interface BaseService {
     /**
      * 采美百科热搜关键词
      */
-    List<String> getBaikeSearchHotWord();
+    List<BaikeHotSearch> getBaikeSearchHotWord();
 
     /**
      * 采美百科banner图

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

@@ -3,6 +3,7 @@ package com.caimei.www.service.page.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.www.mapper.BaseDao;
+import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeType;
 import com.caimei.www.pojo.page.*;
 import com.caimei.www.service.page.BaseService;
@@ -124,8 +125,8 @@ public class BaseServiceImpl implements BaseService {
     }
 
     @Override
-    public List<String> getBaikeSearchHotWord() {
-        List<String> searchHotword = baseDao.getBaikeSearchHotWord();
+    public List<BaikeHotSearch> getBaikeSearchHotWord() {
+        List<BaikeHotSearch> searchHotword = baseDao.getBaikeSearchHotWord();
         return searchHotword;
     }
 

src/main/resources/mapper/BaseMapper.xml

@@ -53,8 +53,8 @@
 		from new_page_friendship_link
 		where delFlag = 0 order by id
     </select>
-    <select id="getBaikeSearchHotWord" resultType="java.lang.String">
-        select keyWord from cm_baike_hot_search where status = 1 order by -sort desc,addTime desc
+    <select id="getBaikeSearchHotWord" resultType="com.caimei.www.pojo.baike.BaikeHotSearch">
+        select keyWord,jumpType,productId,jumpLink from cm_baike_hot_search where status = 1 order by -sort desc,addTime desc
     </select>
     <select id="getBaikeBannerImage" resultType="com.caimei.www.pojo.page.ImageLink">
         select id,