增加小程序首页打开埋点

cloud-site-service/src/main/java/com/yizhi/site/application/mapper/EventTrackMapper.java

@@ -27,7 +27,7 @@ public interface EventTrackMapper extends BaseMapper<EventTrack> {
     DayNumVo getNumByType(@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("siteId") Long siteId, @Param("weekStartDate") String weekStartDate, @Param("weekEndDate") String weekEndDate);
     DayNumVo getTgNumByType(@Param("date") String date,@Param("dateString") String dateString,@Param("siteId") Long siteId);
 
-    List<EventTrackTypeNumVo> queryNumByType(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<Long> subNameList,@Param("siteId") Long siteId,
+    List<EventTrackTypeNumVo> queryNumByType(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<String> subNameList,@Param("siteId") Long siteId,
                                              @Param("isPre") Boolean isPre);
 
     List<EventTrackTypeNumVo> queryNumByTypeInformation(@Param("deptId") Long deptId,@Param("date") String date,@Param("dateString") String dateString,@Param("types")List<Integer> types,@Param("subNameList")List<Long> subNameList,@Param("siteId") Long siteId,

cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/EventTrackServiceImpl.java

@@ -416,19 +416,21 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
 //            }
 //        }
         List<Long> subIdList = null;
+        List<String> subNameList = null;
         if(StringUtils.isNotBlank(parentId)) {
             List<DataClassification> classificationList = dataClassificationService.getSon(Long.valueOf(parentId));
             if (CollectionUtil.isNotEmpty(classificationList)) {
                 subIdList = classificationList.stream().map(DataClassification::getId).collect(Collectors.toList());
+                subNameList = classificationList.stream().map(DataClassification::getName).collect(Collectors.toList());
             }
         }
         List<EventTrackTypeNumVo> eventTrackTypeNumVoList = null;
-        logger.info("埋点统计行为统计入参date:{},isPre:{}, types:{}, dateString:{}, siteId:{}, subIdList:{}", date, isPre, types, dateString, context.getSiteId(), subIdList);
+        logger.info("埋点统计行为统计入参date:{},isPre:{}, types:{}, dateString:{}, siteId:{}, subIdList:{}, subNameList:{}", date, isPre, types, dateString, context.getSiteId(), subIdList,subNameList);
         //判断是否获取阅读量
         if(types.get(0).equals(6)){
             eventTrackTypeNumVoList = this.baseMapper.queryNumByTypeInformation(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
         } else {
-            eventTrackTypeNumVoList = this.baseMapper.queryNumByType(null,date,dateString,types,subIdList,context.getSiteId(), isPre);
+            eventTrackTypeNumVoList = this.baseMapper.queryNumByType(null,date,dateString,types,subNameList,context.getSiteId(), isPre);
             logger.info("埋点统计行为统计查询结果:{}", JSONUtil.toJsonStr(eventTrackTypeNumVoList));
         }
 //        if(CollectionUtil.isNotEmpty(subNameList)){