用户行为优化1.0.4

src/main/java/com/caimei365/tools/controller/BaseApi.java

@@ -95,12 +95,12 @@ public class BaseApi {
     /**
      * 临时接口
      */
-    /*@GetMapping("/base/oldData")
+    @GetMapping("/base/oldData")
     public void oldData(String startTime, String endTime) {
 //        cmBehaviorRecordService.pageStatistics(dateTime);
 //        cmBehaviorRecordService.insertTodayData();
         cmBehaviorRecordService.clubDemand(startTime, endTime);
-    }*/
+    }
 
     @ApiOperation("获取小程序二维码图片")
     @PostMapping("/wxacode")

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

@@ -168,7 +168,7 @@ public interface CmBehaviorRecordMapper {
      * @param accessDate
      * @return
      */
-    Map<String, Integer> getCuxTouris(@Param("accessDate") String accessDate);
+    List<CmBehaviorRecordPo> getCuxTourist(@Param("accessDate") String accessDate);
 
     /**
      * 游客对应用户信息

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

@@ -520,13 +520,14 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
         List<String> recodeTouristId = recordMapper.getRecodeTouristId(format);
         if (null != recodeTouristId && recodeTouristId.size() > 0) {
             // 网站中每个touristId有多个用户
-            Map<String, Integer> cuxTouris = recordMapper.getCuxTouris(format);
+            List<CmBehaviorRecordPo> cuxTourist = recordMapper.getCuxTourist(format);
             // 游客对应用户信息
             List<CmBehaviorTouristInfoPo> touristInfo = recordMapper.getTouristInfo(format, recodeTouristId);
             if (null != touristInfo) {
                 for (String touristId : recodeTouristId) {
                     // 用户个数
-                    num = null == cuxTouris.get(touristId) ? 0 : cuxTouris.get(touristId);
+                    CmBehaviorRecordPo recordPo = cuxTourist.stream().filter(tourist -> tourist.getTouristId().equals(touristId)).collect(Collectors.toList()).get(0);
+                    num = null == recordPo.getCount() ? 0 : recordPo.getCount();
                     // 获取该openId下访问的用户id
                     List<Integer> userIdAttribute = recordMapper.getUserIdAttribute(format, null, touristId);
                     boolean userBean = userIdAttribute.contains(0);
@@ -539,7 +540,7 @@ public class CmBehaviorRecordServiceImpl implements CmBehaviorRecordService {
                                 cmBehaviorRecordPo.setUserId(touristInfoPo.getUserId().toString());
                                 cmBehaviorRecordPo.setTouristId(touristId);
                                 cmBehaviorRecordPo.setAccessDate(format);
-                                //更具游客信息合并用户浏览记录
+                                //根据游客信息合并用户浏览记录
                                 recordMapper.updateBehaviorByTouristId(cmBehaviorRecordPo);
                             }
                         }

src/main/resources/mapper/CmBehaviorRecordMapper.xml

@@ -244,8 +244,8 @@
         SELECT touristId FROM cm_behavior_record WHERE accessDate = #{accessDate} and accessClient = 0 GROUP BY touristId
     </select>
 
-    <select id="getCuxTouris" resultType="java.util.Map">
-        SELECT touristId, COUNT(DISTINCT userId) FROM cm_behavior_record WHERE accessDate = #{accessDate} AND accessClient = 0 GROUP BY touristId
+    <select id="getCuxTourist" resultType="com.caimei365.tools.model.po.CmBehaviorRecordPo">
+        SELECT touristId, COUNT(DISTINCT userId) as count FROM cm_behavior_record WHERE accessDate = #{accessDate} AND accessClient = 0 GROUP BY touristId
     </select>
 
     <select id="getTouristInfo" resultType="com.caimei365.tools.model.po.CmBehaviorTouristInfoPo">