小需求优化V1.3.13

src/main/java/com/caimei365/commodity/controller/SearchProductApi.java

@@ -1,6 +1,5 @@
 package com.caimei365.commodity.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.caimei365.commodity.annotation.IpSave;
 import com.caimei365.commodity.model.ResponseJson;
 import com.caimei365.commodity.model.po.SearchHistoryPo;
@@ -232,8 +231,8 @@ public class SearchProductApi {
      * @return
      */
     @GetMapping("/con/keyword")
-    public ResponseJson conKeyword(Integer fromType, String path, String keyword) {
-        return ResponseJson.success(searchProductService.conKeyword(fromType, path, keyword));
+    public ResponseJson conKeyword(String keyword) {
+        return ResponseJson.success(searchProductService.conKeyword( keyword));
     }
 
     /**

src/main/java/com/caimei365/commodity/mapper/SearchFrequencyMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 @Mapper
 public interface SearchFrequencyMapper {
 
-    List<SearchFrequencyVo> getInfoBykeyword(String keyword, Integer fromSearch);
+    List<SearchFrequencyVo> getInfoBykeyword(String keyword);
 
     void saveInfo(SearchFrequencyVo searchFrequencyVo);
 

src/main/java/com/caimei365/commodity/service/SearchProductService.java

@@ -107,7 +107,7 @@ public interface SearchProductService {
      * @param keyword
      * @return
      */
-    ResponseJson conKeyword(Integer fromType, String path, String keyword);
+    ResponseJson conKeyword(String keyword);
 
     /**
      * 获取已加入关键词库的关键词进行搜索联动

src/main/java/com/caimei365/commodity/service/impl/CmPraiseStatisticsServiceImpl.java

@@ -25,14 +25,14 @@ public class CmPraiseStatisticsServiceImpl implements CmPraiseStatisticsService
      */
     @Override
     public int addPvCmPraiseStatistics(CmPraiseStatistics cmPraiseStatistics) {
-        CmPraiseStatistics byCmPraiseStatistics = cmPraiseStatisticsMapper.getByCmPraiseStatistics(cmPraiseStatistics);
-        if (null != byCmPraiseStatistics) {
-            byCmPraiseStatistics.setPv(byCmPraiseStatistics.getPv() + 1);
-            return cmPraiseStatisticsMapper.updateCmPraiseStatistics(byCmPraiseStatistics);
-        } else {
+        // CmPraiseStatistics byCmPraiseStatistics = cmPraiseStatisticsMapper.getByCmPraiseStatistics(cmPraiseStatistics);
+        // if (null != byCmPraiseStatistics) {
+        //     byCmPraiseStatistics.setPv(byCmPraiseStatistics.getPv() + 1);
+        //     return cmPraiseStatisticsMapper.updateCmPraiseStatistics(byCmPraiseStatistics);
+        // } else {
             cmPraiseStatistics.setPv(1);
             return cmPraiseStatisticsMapper.addCmPraiseStatistics(cmPraiseStatistics);
-        }
+        // }
     }
 
 

src/main/java/com/caimei365/commodity/service/impl/SearchProductServiceImpl.java

@@ -10,10 +10,12 @@ import com.aliyun.opensearch.sdk.generated.search.SearchParams;
 import com.caimei365.commodity.components.PriceUtilService;
 import com.caimei365.commodity.components.RedisService;
 import com.caimei365.commodity.components.SearchOpenService;
+import com.caimei365.commodity.mapper.CmPraiseStatisticsMapper;
 import com.caimei365.commodity.mapper.PageMapper;
 import com.caimei365.commodity.mapper.SearchFrequencyMapper;
 import com.caimei365.commodity.mapper.SearchMapper;
 import com.caimei365.commodity.model.ResponseJson;
+import com.caimei365.commodity.model.po.CmPraiseStatistics;
 import com.caimei365.commodity.model.po.SearchHistoryPo;
 import com.caimei365.commodity.model.search.ProductListVo;
 import com.caimei365.commodity.model.vo.HotSearchVo;
@@ -26,7 +28,6 @@ import com.caimei365.commodity.utils.Json2PojoUtil;
 import com.github.pagehelper.PageHelper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -59,9 +60,10 @@ public class SearchProductServiceImpl implements SearchProductService {
     @Resource
     private SearchFrequencyMapper searchFrequencyMapper;
 
-    @Autowired
+    @Resource
     private RedisService redisService;
-
+    @Resource
+    private CmPraiseStatisticsMapper cmPraiseStatisticsMapper;
     /**
      * 根据关键词搜索商品
      *
@@ -616,25 +618,31 @@ public class SearchProductServiceImpl implements SearchProductService {
      * @return
      */
     @Override
-    public ResponseJson conKeyword(Integer fromType, String path, String keyword) {
-        Date date = new Date();
-        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
-        sf.format(date);
+    public ResponseJson conKeyword(String keyword) {
+        // Date date = new Date();
+        // SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+        // sf.format(date);
         //根据关键词和来源查询数据库是否存在（存在来源也相同时增加次数,存在但来源不同时和不存在则新增）
-        List<SearchFrequencyVo> searchFrequencyVoList = searchFrequencyMapper.getInfoBykeyword(keyword, fromType);
+        List<SearchFrequencyVo> searchFrequencyVoList = searchFrequencyMapper.getInfoBykeyword(keyword);
         if (null != searchFrequencyVoList && searchFrequencyVoList.size() > 0) {
             //存在 统计次数
+            cmPraiseStatisticsMapper.addCmPraiseStatistics(new CmPraiseStatistics()
+                    .setType("6")
+                    .setAuthorId(String.valueOf(searchFrequencyVoList.get(0).getId()))
+                    .setPv(1)
+            );
             Integer frequency = searchFrequencyVoList.get(0).getFrequency() + 1;
             searchFrequencyMapper.upFrequencyById(searchFrequencyVoList.get(0).getId(), frequency);
-        } else {
-            //不存在 新增
-            SearchFrequencyVo sea = new SearchFrequencyVo();
-            sea.setKeyword(keyword);
-            sea.setFrequency(1);
-            sea.setFromSearch(fromType);
-            sea.setSearchTime(new java.sql.Date(date.getTime()));
-            searchFrequencyMapper.saveInfo(sea);
         }
+        // } else {
+        //     //不存在 新增
+        //     SearchFrequencyVo sea = new SearchFrequencyVo();
+        //     sea.setKeyword(keyword);
+        //     sea.setFrequency(1);
+        //     sea.setFromSearch(fromType);
+        //     sea.setSearchTime(new java.sql.Date(date.getTime()));
+        //     searchFrequencyMapper.saveInfo(sea);
+        // }
         return ResponseJson.success();
     }
 

src/main/resources/mapper/SearchFrequencyMapper.xml

@@ -11,7 +11,6 @@
                trueStatus
         from cm_user_search_frequency
         where keyword = #{keyword}
-          and fromSearch = #{fromSearch}
     </select>
 
     <insert id="saveInfo" parameterType="com.caimei365.commodity.model.vo.SearchFrequencyVo">