Merge branch 'branch' of wangfan/adweb3-server into master

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/common/util/DateUtil.java

@@ -49,7 +49,7 @@ public class DateUtil {
 
     public static final ZoneId DEFAULT_ZONE_ID = ZoneId.of("Asia/Shanghai");
 
-    /* 日期类型, {@link #getDateRangeByType(String)}方法参数 */
+    /** 日期类型, {@link #getDateRangeByType(String)}方法参数 */
     public static final String DATE_TYPE_TODAY = "today";
     public static final String DATE_TYPE_YESTERDAY = "yesterday";
     public static final String DATE_TYPE_SEVEN_DAYS = "sevenDay";

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/RealtimeReportService.java

@@ -262,7 +262,7 @@ public class RealtimeReportService {
 
         // 6. 根据日期排序并返回
         return dailyStatsVOs.values().stream()
-                .sorted(Comparator.comparing(DailyStatsVO::getDate)) // 排日期升序排序
+                .sorted(Comparator.comparing(DailyStatsVO::getDate)) // 按日期升序排序
                 .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
     }
 
@@ -416,7 +416,7 @@ public class RealtimeReportService {
                 .sorted(
                         Comparator.comparingInt(SourceMediumStatsVO::getTotalUsers)
                                 .thenComparingDouble(SourceMediumStatsVO::getAvgSessionDuration)
-                                .reversed())
+                                .reversed()) // 按totalUsers和avgSessionDuration降序排序
                 .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
     }
 
@@ -491,7 +491,7 @@ public class RealtimeReportService {
                 .sorted(
                         Comparator.comparingInt(PagePathStatsVO::getPageViews)
                                 .thenComparingDouble(PagePathStatsVO::getAvgTimeOnPage)
-                                .reversed())
+                                .reversed()) // 按pageViews和avgTimeOnPage降序排序
                 .limit(limit)
                 .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
     }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/adweb/dmp/service/impl/GADailyReportServiceImpl.java

@@ -119,7 +119,7 @@ public class GADailyReportServiceImpl extends ServiceImpl<GADailyReportMapper, G
 
         // 3. 根据日期排序并返回
         return dailyStatsVOs.values().stream()
-                .sorted(Comparator.comparing(DailyStatsVO::getDate)) // 排日期升序排序
+                .sorted(Comparator.comparing(DailyStatsVO::getDate)) // 按日期升序排序
                 .collect(Collectors.toList()); // 使用toList()方法返回UnmodifiableList，导致Redis类型解析异常
     }