Merge remote-tracking branch 'origin/developerD' into developer

# Conflicts:
#	src/main/java/com/caimei365/tools/listener/IpSaveListener.java

src/main/java/com/caimei365/tools/listener/IpSaveListener.java

@@ -1,8 +1,7 @@
 package com.caimei365.tools.listener;
 
 import com.caimei365.tools.model.po.IpSavePo;
-import com.caimei365.tools.model.po.SearchFrequencyVo;
-import com.caimei365.tools.service.ProductService;
+import com.caimei365.tools.service.CmBehaviorRecordService;
 import com.caimei365.tools.service.impl.IpSaveService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -11,7 +10,6 @@ import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -32,8 +30,8 @@ public class IpSaveListener implements RocketMQListener<String> {
 
     @Autowired
     private IpSaveService ipSaveService;
-    @Resource
-    private ProductService productService;
+
+    @Autowired private CmBehaviorRecordService recordService;
 
     @Override
     public void onMessage(String message) {
@@ -45,8 +43,6 @@ public class IpSaveListener implements RocketMQListener<String> {
         String param = params[2];
         String saveName = params[3];
         IpSavePo ipSavePo = new IpSavePo();
-//        SearchFrequencyVo searchFrequencyVo=new SearchFrequencyVo();
-//        searchFrequencyVo.setPath(path);
         if (StringUtils.isNotBlank(param)) {
             ipSavePo.setParams(param);
             if (param.contains("userId") || param.contains("keyword")) {
@@ -73,7 +69,6 @@ public class IpSaveListener implements RocketMQListener<String> {
                                     va = java.net.URLDecoder.decode(va, "UTF-8");
                                 }
                                 ipSavePo.setKeyWord(va);
-//                                searchFrequencyVo.setKeyword(va);
                             } catch (UnsupportedEncodingException e) {
                                 e.printStackTrace();
                             }
@@ -95,35 +90,10 @@ public class IpSaveListener implements RocketMQListener<String> {
         String nowDate = format.format(new Date());
         Long aLong = Long.valueOf(nowDate);
         ipSavePo.setSaveTime(aLong);
-//        //根据来源统计关键词
-//        //首页搜索  fromSearch = 1
-//        if(null !=searchFrequencyVo &&"/commodity/search/query/product".equals(searchFrequencyVo.getPath())){
-//            searchFrequencyVo.setFromSearch(1);
-//            if(StringUtils.isNotBlank(searchFrequencyVo.getKeyword())){
-//                productService.conKeyword(searchFrequencyVo.getFromSearch(),searchFrequencyVo.getPath(),searchFrequencyVo.getKeyword());
-//            }
-//        }
-//        //信息中心搜索  fromSearch = 2
-//        if(null !=searchFrequencyVo &&"/commodity/search/query/article".equals(searchFrequencyVo.getPath())){
-//            searchFrequencyVo.setFromSearch(2);
-//            if(StringUtils.isNotBlank(searchFrequencyVo.getKeyword())){
-//                productService.conKeyword(searchFrequencyVo.getFromSearch(),searchFrequencyVo.getPath(),searchFrequencyVo.getKeyword());
-//            }
-//        }
-//        //美业资料搜索 fromSearch=3
-//        if(null !=searchFrequencyVo &&"/commodity/product/archive".equals(searchFrequencyVo.getPath())){
-//            searchFrequencyVo.setFromSearch(3);
-//            if(StringUtils.isNotBlank(searchFrequencyVo.getKeyword())){
-//                productService.conKeyword(searchFrequencyVo.getFromSearch(),searchFrequencyVo.getPath(),searchFrequencyVo.getKeyword());
-//            }
-//        }
-//        //供应商主页搜索 fromSearch=4
-//        if(null !=searchFrequencyVo &&"/commodity/search/query/baike/keyword".equals(searchFrequencyVo.getPath())){
-//            searchFrequencyVo.setFromSearch(4);
-//            if(StringUtils.isNotBlank(searchFrequencyVo.getKeyword())){
-//                productService.conKeyword(searchFrequencyVo.getFromSearch(),searchFrequencyVo.getPath(),searchFrequencyVo.getKeyword());
-//            }
-//        }
         ipSaveService.save(ipSavePo);
+        // 用户行为记录
+        if ("/user/record/StatisticsPc".equals(ipSavePo.getRequestUrl().trim()) || "/user/record/StatisticsApp".equals(ipSavePo.getRequestUrl().trim())) {
+            recordService.insertRecord(ipSavePo);
+        }
     }
 }

src/main/java/com/caimei365/tools/mapper/CmBehaviorRecordMapper.java

@@ -0,0 +1,21 @@
+package com.caimei365.tools.mapper;
+
+import com.caimei365.tools.model.po.CmBehaviorRecordPo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/11/2
+ */
+@Mapper
+public interface CmBehaviorRecordMapper {
+
+    /**
+     * 用户行为记录
+     * @param cmBehaviorRecordPo
+     * @return
+     */
+    void insertRecord(CmBehaviorRecordPo cmBehaviorRecordPo);
+}

src/main/java/com/caimei365/tools/model/po/CmBehaviorRecordPo.java

@@ -0,0 +1,61 @@
+package com.caimei365.tools.model.po;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/11/2
+ */
+@Data
+public class CmBehaviorRecordPo {
+
+    private Integer recordID ;
+    /**
+     * 访问人IP地址
+     */
+    private String ip;
+    /**
+     * 用户id、0为游客
+     */
+    private String userId;
+    /**
+     * 页面路径
+     */
+    private String pagePath;
+    /**
+     * 页面类型
+     */
+    private Integer pageType;
+    /**
+     * 页面标签
+     */
+    private String pageLabel;
+    /**
+     * 商品图片
+     */
+    private String productImage;
+    /**
+     * 商品ID
+     */
+    private String productId;
+    /**
+     * 商品名称
+     */
+    private String productName;
+    /**
+     * 访问时间
+     */
+    private Date accessTime;
+    /**
+     * 访问时长
+     */
+    private String accessDuration;
+    /**
+     * 访问日期
+     */
+    private String accessDate;
+}

src/main/java/com/caimei365/tools/service/CmBehaviorRecordService.java

@@ -0,0 +1,14 @@
+package com.caimei365.tools.service;
+
+import com.caimei365.tools.model.po.CmBehaviorRecordPo;
+import com.caimei365.tools.model.po.IpSavePo;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/11/2
+ */
+public interface CmBehaviorRecordService {
+    void insertRecord(IpSavePo ipSavePo);
+}

src/main/java/com/caimei365/tools/service/impl/CmBehaviorRecordServiceImpl.java

@@ -0,0 +1,138 @@
+package com.caimei365.tools.service.impl;
+
+import com.caimei365.tools.mapper.CmBehaviorRecordMapper;
+import com.caimei365.tools.model.po.CmBehaviorRecordPo;
+import com.caimei365.tools.model.po.IpSavePo;
+import com.caimei365.tools.service.CmBehaviorRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2022/11/2
+ */
+@Slf4j
+@Service
+public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
+
+    @Autowired private CmBehaviorRecordMapper recordMapper;
+
+    @Override
+    public void insertRecord(IpSavePo ipSavePo) {
+        if ("/user/record/StatisticsPc".equals(ipSavePo.getRequestUrl().trim()) || "/user/record/StatisticsApp".equals(ipSavePo.getRequestUrl().trim())) {
+            log.info("用户行为记录=================》" + ipSavePo.getIp());
+            CmBehaviorRecordPo cmBehaviorRecordPo = new CmBehaviorRecordPo();
+            cmBehaviorRecordPo.setIp(ipSavePo.getIp());
+            if (StringUtils.isNotBlank(ipSavePo.getUserId())) {
+                cmBehaviorRecordPo.setUserId(ipSavePo.getUserId());
+            } else {
+                cmBehaviorRecordPo.setUserId("0");
+            }
+            if (ipSavePo.getParams().contains("userId") || ipSavePo.getParams().contains("productId")) {
+                String[] split = ipSavePo.getParams().split("&");
+                for (String s : split) {
+                    // 页面路径
+                    if (s.contains("pagePath") && s.contains("=")) {
+                        String[] split1 = s.split("=");
+                        if (split1.length > 1) {
+                            String value = split1[1];
+                            String trim = value.trim();
+                            if (StringUtils.isNotBlank(trim)) {
+                                String decode = null;
+                                try {
+                                    decode = java.net.URLDecoder.decode(trim,"UTF-8");
+                                    if (decode.contains("%")) {
+                                        decode = java.net.URLDecoder.decode(decode, "UTF-8");
+                                    }
+                                } catch (UnsupportedEncodingException e) {
+                                    e.printStackTrace();
+                                }
+                                cmBehaviorRecordPo.setPagePath(decode);
+                            }
+                            if (StringUtils.isEmpty(cmBehaviorRecordPo.getPagePath())) {
+                                log.info("页面路径pagePath 值为====》" + trim);
+                                return ;
+                            }
+                        }
+                    }
+                    // 页面类型
+                    if (s.contains("pageType") && s.contains("=")) {
+                        String[] split1 = s.split("=");
+                        if (split1.length > 1) {
+                            String value = split1[1];
+                            String trim = value.trim();
+                            if (StringUtils.isNotBlank(trim)) {
+                                int parseInt = Integer.parseInt(trim);
+
+                                cmBehaviorRecordPo.setPageType(parseInt);
+                            }
+                        }
+                    }
+                    // 页面标签
+                    if (s.contains("pageLabel") && s.contains("=")) {
+                        String[] split1 = s.split("=");
+                        cmBehaviorRecordPo.setPageLabel("");
+                        if (split1.length > 1) {
+                            String value = split1[1];
+                            String trim = value.trim();
+                            if (StringUtils.isNotBlank(trim)) {
+
+                                // 接口参数解码
+                                String decode = null;
+                                try {
+                                    decode = java.net.URLDecoder.decode(trim, "UTF-8");
+                                    if (decode.contains("%")) {
+                                        decode = java.net.URLDecoder.decode(decode, "UTF-8");
+                                    }
+                                } catch (UnsupportedEncodingException e) {
+                                    e.printStackTrace();
+                                }
+                                cmBehaviorRecordPo.setPageLabel(decode);
+                            }
+                        }
+                    }
+                    // 商品ID
+                    if (s.contains("productId") && s.contains("=")) {
+                        String[] split1 = s.split("=");
+                        if (split1.length > 1) {
+                            String value = split1[1];
+                            String trim = value.trim();
+                            if (StringUtils.isNotBlank(trim)) {
+                                cmBehaviorRecordPo.setProductId(trim);
+                            }
+                        }
+                    }
+                    // 访问时长
+                    if (s.contains("accessDuration") && s.contains("=")) {
+                        String[] split1 = s.split("=");
+                        if (split1.length > 1) {
+                            String value = split1[1];
+                            String trim = value.trim();
+                            if (StringUtils.isNotBlank(trim)) {
+                                cmBehaviorRecordPo.setAccessDuration(trim);
+                            }
+                        }
+                    }
+                }
+            }
+
+            Date date = new Date();
+            cmBehaviorRecordPo.setAccessTime(date);
+
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String format = simpleDateFormat.format(date);
+            cmBehaviorRecordPo.setAccessDate(format);
+            recordMapper.insertRecord(cmBehaviorRecordPo);
+        }
+    }
+}

src/main/resources/mapper/CmBehaviorRecordMapper.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.caimei365.tools.mapper.CmBehaviorRecordMapper">
+    <insert id="insertRecord">
+        INSERT INTO cm_behavior_record (IP, userID, pagePath, pageType, pageLabel, productID, accessTime, accessDuration, accessDate)
+        VALUES(#{ip},#{userId},#{pagePath},#{pageType},#{pageLabel},#{productId},#{accessTime},#{accessDuration},#{accessDate})
+    </insert>
+</mapper>