评论，收藏，点赞 埋点面板修改

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

@@ -30,7 +30,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<String> 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<Long> 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<String> subNameList,@Param("siteId") Long siteId,

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

@@ -399,13 +399,12 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
         return null;
     }
 
-    private List<EventTrackTypeNumVo> queryNumByType(String date, Boolean isPre, List<Integer> types,String subIds) {
-        logger.info("埋点统计行为统计入参date:{},isPre:{}, types:{}, subName:{}", date, isPre, types, subIds);
+    private List<EventTrackTypeNumVo> queryNumByType(String date, Boolean isPre, List<Integer> types,String parentId) {
+        logger.info("埋点统计行为统计入参date:{},isPre:{}, types:{}, parentId:{}", date, isPre, types, parentId);
         if(ObjectUtils.isEmpty(date)){
             date = "3";
         }
         String dateString =getDateString(date);
-        Long id = null;
         RequestContext context = ContextHolder.get();
 //        if(!ObjectUtils.isEmpty(subName)) {
 //            String key = "event_track_type";
@@ -418,16 +417,12 @@ public class EventTrackServiceImpl extends ServiceImpl<EventTrackMapper, EventTr
 //                }
 //            }
 //        }
-        List<String> subNameList = null;
-//        List<DataClassification>  classificationList =  null;
-//        if(id!=null) {
-//            classificationList =  dataClassificationService.getSon(id);
-//            if(CollectionUtil.isNotEmpty(classificationList)){
-//                subNameList = classificationList.stream().map(DataClassification::getName).collect(Collectors.toList());
-//            }
-//        }
+        List<Long> subIdList = null;
+        List<DataClassification>  classificationList = dataClassificationService.getSon(Long.valueOf(parentId));
+        if(CollectionUtil.isNotEmpty(classificationList)){
+            subIdList = classificationList.stream().map(DataClassification::getId).collect(Collectors.toList());
+        }
         List<EventTrackTypeNumVo> eventTrackTypeNumVoList = null;
-        List<String> subIdList = Arrays.asList(subIds.split(","));
         //判断是否获取阅读量
 //        if(types.get(0).equals(6)){
             //阅读量