用户行为记录详情

src/main/java/com/caimei365/manager/controller/caimei/user/CmBehaviorRecordApi.java

@@ -17,6 +17,7 @@ import javax.swing.filechooser.FileSystemView;
 import java.io.File;
 import java.net.URLEncoder;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -96,9 +97,9 @@ public class CmBehaviorRecordApi {
      * @return 返回
      */
     @GetMapping("/record/recordList")
-    public ResponseJson<PaginationVo<CmBehaviorRecord>> recordList (CmBehaviorRecord cmBehaviorRecord,
-                                                                    @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
-                                                                    @RequestParam(value = "pageSize",defaultValue = "20")int pageSize) {
+    public ResponseJson<Map<String, Object>> recordList (CmBehaviorRecord cmBehaviorRecord,
+                                                                        @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+                                                                        @RequestParam(value = "pageSize",defaultValue = "20")int pageSize) {
         return recordService.recordList(cmBehaviorRecord, pageNum, pageSize);
     }
 

src/main/java/com/caimei365/manager/service/caimei/user/CmBehaviorRecordService.java

@@ -6,6 +6,7 @@ import com.caimei365.manager.entity.caimei.CmBehaviorRecord;
 import com.caimei365.manager.entity.caimei.CmPageType;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -50,7 +51,7 @@ public interface CmBehaviorRecordService {
      * @param pageSize
      * @return
      */
-    ResponseJson<PaginationVo<CmBehaviorRecord>> recordList(CmBehaviorRecord cmBehaviorRecord,Integer pageNum, Integer pageSize);
+    ResponseJson<Map<String, Object>> recordList(CmBehaviorRecord cmBehaviorRecord, Integer pageNum, Integer pageSize);
 
     /**
      * 标签库数据

src/main/java/com/caimei365/manager/service/caimei/user/impl/CmBehaviorRecordServiceImpl.java

@@ -162,7 +162,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
      * @return
      */
     @Override
-    public ResponseJson<PaginationVo<CmBehaviorRecord>> recordList(CmBehaviorRecord cmBehaviorRecord, Integer pageNum, Integer pageSize) {
+    public ResponseJson<Map<String, Object>> recordList(CmBehaviorRecord cmBehaviorRecord, Integer pageNum, Integer pageSize) {
+        Map<String, Object> map = new HashMap<>();
         PageHelper.startPage(pageNum, pageSize);
         // 详情
         List<CmBehaviorRecord> recordList = cmBehaviorRecordDao.recordList(cmBehaviorRecord);
@@ -170,6 +171,8 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
         List<CmBehaviorRecord> reginList = cmBehaviorRecordDao.selRegion(cmBehaviorRecord.getAccessDate());
         // 供应商信息
         List<CmBehaviorRecord> shopNameList = cmBehaviorRecordDao.behaviorShopNameList();
+        // 标签总结
+        List<String> label = new ArrayList<>();
         // 计算访问时长，填入信息
         recordList.forEach(r -> {
             r.setProductImage(AppUtils.getImageURL("product", r.getProductImage(), 0, ""));
@@ -216,9 +219,17 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                 }
                 r.setRelevanceShop(shopName);
             }
+            if ("6".equals(r.getPageType()) || "8".equals(r.getPageType()) || "9".equals(r.getPageType()) || "11".equals(r.getPageType())) {
+                if(StringUtils.isNotBlank(r.getPageLabel()) && StringUtils.isNotEmpty(r.getPageLabel()) && !label.contains(r.getPageLabel())) {
+                    label.add(r.getPageLabel());
+                }
+            }
         });
         PaginationVo<CmBehaviorRecord> pageData = new PaginationVo<>(recordList);
-        return ResponseJson.success(pageData);
+        map.put("page", pageData);
+        String summarize = StringUtils.strip(label.toString(), "[]");
+        map.put("summarize", summarize);
+        return ResponseJson.success(map);
     }
 
     /**