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

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

@@ -1,6 +1,7 @@
 package com.caimei.www.controller.unlimited;
 
 import com.caimei.www.controller.BaseController;
+import com.caimei.www.pojo.baike.BaikeHotSearch;
 import com.caimei.www.pojo.baike.BaikeProductVo;
 import com.caimei.www.pojo.baike.BaikeTypeVo;
 import com.caimei.www.service.page.ProductService;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -41,11 +43,19 @@ public class EncyclopediaController extends BaseController {
     @GetMapping("/list-{typeId}.html")
     public String getEncyclopediaList(final Model model,@PathVariable("typeId") Integer typeId) {
         //词条信息
+        SimpleDateFormat sl=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<BaikeProductVo> authUserList = productService.getAuthUserList(typeId);
+        if(null!=authUserList&&authUserList.size()>0){
+        for (BaikeProductVo baikeProductVo:authUserList) {
+                if(null!=baikeProductVo.getPublishTime()){
+                    baikeProductVo.setPublishTimeStr(sl.format(baikeProductVo.getPublishTime()));
+                }
+        }
+        }
         //分类集合
         List<BaikeTypeVo> TypeList = productService.geTypeList();
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords();
+        List<BaikeHotSearch> hotSeracherWords=productService.getHotWords();
         model.addAttribute("authUserList", authUserList);
         model.addAttribute("TypeList", TypeList);
         model.addAttribute("hotSeracherWords", hotSeracherWords);
@@ -57,9 +67,15 @@ public class EncyclopediaController extends BaseController {
      * */
     @GetMapping("/detail-{id}.html")
     public String getEncyclopediaDetail(final Model model, @PathVariable("id") Integer id) {
+        SimpleDateFormat sl=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         BaikeProductVo baikeproduct = productService.getEncyclopediaDetail(id);
+        if(null!=baikeproduct){
+            if(null!=baikeproduct.getPublishTime()){
+                baikeproduct.setPublishTimeStr(sl.format(baikeproduct.getPublishTime()));
+            }
+        }
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords();
+        List<BaikeHotSearch> hotSeracherWords=productService.getHotWords();
         model.addAttribute("hotSeracherWords", hotSeracherWords);
         model.addAttribute("baikeproduct", baikeproduct);
         return ENCYCLOPEDIA_DETAIL;
@@ -71,7 +87,7 @@ public class EncyclopediaController extends BaseController {
     @GetMapping("/search.html")
     public String getEncyclopediaSearch(final Model model) {
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords();
+        List<BaikeHotSearch> hotSeracherWords=productService.getHotWords();
         model.addAttribute("hotSeracherWords", hotSeracherWords);
         return ENCYCLOPEDIA_SEARCH;
     }
@@ -82,7 +98,7 @@ public class EncyclopediaController extends BaseController {
     @GetMapping("/about.html")
     public String getEncyclopediaAbout(final Model model) {
         //热搜词
-        List<String> hotSeracherWords=productService.getHotWords();
+        List<BaikeHotSearch> 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();
+    List<BaikeHotSearch> getHotWords();
 
 
     BaikeProductVo getEntryInfoById(Integer id);

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

@@ -45,6 +45,12 @@ public class BaikeProductVo implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date publishTime;
 
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String publishTimeStr;
+
     /**
      * 浏览量
      */

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

@@ -3,10 +3,7 @@ package com.caimei.www.service.page;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.caimei.www.pojo.JsonModel;
-import com.caimei.www.pojo.baike.BaikeProduct;
-import com.caimei.www.pojo.baike.BaikeProductVo;
-import com.caimei.www.pojo.baike.BaikeType;
-import com.caimei.www.pojo.baike.BaikeTypeVo;
+import com.caimei.www.pojo.baike.*;
 import com.caimei.www.pojo.page.Parameter;
 import com.caimei.www.pojo.page.ProductDetail;
 import com.caimei.www.pojo.page.ProductList;
@@ -108,7 +105,7 @@ public interface ProductService {
 
     List<BaikeProductVo> getAuthUserList(Integer typeId);
 
-    List<String> getHotWords();
+    List<BaikeHotSearch> 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(){
-        List<String> authUserList = baikeDao.getHotWords();
+    public List<BaikeHotSearch> getHotWords(){
+        List<BaikeHotSearch> authUserList = baikeDao.getHotWords();
         return authUserList;
     }
 

src/main/resources/mapper/BaikeMapper.xml

@@ -118,7 +118,7 @@
 		order by p.publishTime desc
 	</select>
 
-	<select id="getHotWords" resultType="java.lang.String">
+	<select id="getHotWords" resultType="com.caimei.www.pojo.baike.BaikeHotSearch">
 		select
 			p.id,
 			p.keyWord,