Merge remote-tracking branch 'origin/developerA' into developerB

src/main/java/com/caimei365/manager/controller/caimei/keyword/KeyWordApi.java

@@ -39,8 +39,8 @@ public class KeyWordApi {
      */
     @GetMapping("/keyword/list")
     public ResponseJson<PaginationVo<KeyWord>> getKeyWordList(String keyword, String beginTime, String endTime,
-                                                              Integer labelStatus, Integer searchTimeCode,
-                                                              Integer fromSearch,
+                                                              Integer labelStatus, Integer fromSearch,
+                                                              @RequestParam(value = "searchTimeCode", defaultValue = "1") Integer searchTimeCode,
                                                               @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                               @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
         return keyWordService.getKeyWordList(keyword, searchTimeCode, fromSearch, beginTime, endTime, labelStatus, pageNum, pageSize);
@@ -110,11 +110,12 @@ public class KeyWordApi {
 
     /**
      * 删除标签
+     *
      * @param id
      * @return
      */
     @GetMapping("/delete/label")
-    public ResponseJson delLabel(String id){
+    public ResponseJson delLabel(String id) {
         return keyWordService.deleteLabel(id);
     }
 }

src/main/java/com/caimei365/manager/service/caimei/impl/KeyWordServiceImpl.java

@@ -1,6 +1,7 @@
 package com.caimei365.manager.service.caimei.impl;
 
 import cn.hutool.core.lang.Assert;
+import com.alibaba.excel.util.StringUtils;
 import com.caimei365.manager.dao.KeyWordDao;
 import com.caimei365.manager.entity.PaginationVo;
 import com.caimei365.manager.entity.ResponseJson;
@@ -9,7 +10,6 @@ import com.caimei365.manager.entity.caimei.enums.KeyWordEnum;
 import com.caimei365.manager.service.caimei.KeyWordService;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.tomcat.util.buf.StringUtils;
 import org.springframework.stereotype.Service;
 
 
@@ -35,6 +35,12 @@ public class KeyWordServiceImpl implements KeyWordService {
             beginTime = timeVal.get("beginTime");
             endTime = timeVal.get("endTime");
         }
+        if (!StringUtils.isEmpty(beginTime)) {
+            beginTime += " 00:00:00";
+        }
+        if (!StringUtils.isEmpty(endTime)) {
+            endTime += " 23:59:59";
+        }
         PageHelper.startPage(pageNum, pageSize);
         List<KeyWord> keyWords = keyWordDao.findList(keyword, fromSearch, beginTime, endTime, labelStatus);
         PaginationVo<KeyWord> pageData = new PaginationVo<>(keyWords);

src/main/resources/mapper/KeyWordDao.xml

@@ -32,13 +32,12 @@
     </update>
 
     <select id="findList" resultType="com.caimei365.manager.entity.caimei.KeyWord">
-        SELECT cusf.id AS id, COUNT(cls.keyWordId) AS frequency, cusf.keyword as keyword,addTime,
+        SELECT cusf.id AS id, frequency, cusf.keyword as keyword,addTime,
         cusf.searchTime as searchTime,cusf.trueStatus as labelStatus,cusf.fromSearch as fromSearch
         FROM cm_user_search_frequency cusf
-        LEFT JOIN cm_label_source cls ON cls.keywordid = cusf.id
         WHERE cusf.delStatus = 1
         <if test="beginTime !=null and beginTime !=''">
-            AND saveTime BETWEEN #{beginTime} AND #{endTime}
+            AND searchTime BETWEEN #{beginTime} AND #{endTime}
         </if>
         <if test="keyword !=null and keyword !=''">
             AND keyword LIKE CONCAT('%',#{keyword},'%')
@@ -49,8 +48,7 @@
         <if test="fromSearch != null">
             AND fromSearch = #{fromSearch}
         </if>
-        GROUP BY cusf.id
-        ORDER BY frequency DESC
+        ORDER BY frequency DESC,searchTime DESC
     </select>
 
     <select id="findRecommendList" resultType="com.caimei365.manager.entity.caimei.KeyWord">
@@ -59,6 +57,7 @@
         where trueStatus = 0
         and delStatus = 1
         and recommendFlag = 0
+        and recommendStatus = 1
         <if test="beginTime !=null and beginTime !=''">
             AND recommendTime BETWEEN #{beginTime} AND #{endTime}
         </if>