Преглед изворни кода

fix(dashboard): 首页 PV/UV 按日去重、停留时长归一、最近任务与内容卡片等高

1. 商品停留时长异常(瓜尔纤维 29903022 分)根因:小程序埋点未 start 就 flush 时
   start=0,Date.now()-0 被当作停留秒数(≈17.9 亿秒)。三层修复:
   - dwellTracker.js:未 start 不上报 + 单次上限 30 分钟
   - StatsController.recordProductView:入库前收敛到 [0,1800]
   - 聚合统一走 saneDwell()(null/负数归零、超 30 分钟截断),历史脏数据不再放大
2. PV/UV 恒等根因:按日 UV 直接复用 PV 计数(counts[1]++)。改为当日 distinct userId,
   KPI 与趋势图同口径(PV=阅读次数,UV=当日去重读者),并在卡片标注口径。
3. 最近任务高度不足根因:全局 :has(.adm-table-wrap) 撑满链把首页压成一屏高度,
   表格被压缩。首页脱离该链恢复自然滚动,content-row 改 flex 等高,表格填满卡片。
4. 内容吸引力/内容广度卡片增加 420px 默认高度 + 同行等高,数据缺失时不再参差。
Xiaogang Liao пре 3 дана
родитељ
комит
13146869d4

+ 46 - 42
cfc-backend/src/main/java/com/etotem/cfc/controller/stats/StatsController.java

@@ -83,6 +83,15 @@ public class StatsController {
     @Resource private ProductViewRecordMapper productViewRecordMapper;
     @Resource private ShareReadMapper shareReadMapper;
 
+    /** 单条停留时长上限(秒):超过 30 分钟按 30 分钟计,避免后台挂起/埋点异常把时长放大成天文数字 */
+    private static final int MAX_DWELL_SECONDS = 1800;
+
+    /** 停留时长归一:null/负数归零,超上限截断(聚合与入库共用同一口径) */
+    private static long saneDwell(Integer seconds) {
+        if (seconds == null || seconds <= 0) return 0L;
+        return Math.min(seconds, MAX_DWELL_SECONDS);
+    }
+
     // ── 管理后台仪表盘 ──
 
     @Operation(summary = "管理后台仪表盘汇总")
@@ -426,60 +435,51 @@ public class StatsController {
             Date thirtyDaysAgo = cal.getTime();
             SimpleDateFormat dayFmt = new SimpleDateFormat("yyyy-MM-dd");
 
-            // 1. 用户访问情况(近30天按日汇总 UV/PV)
-            // PV:article_reading_records 中的阅读记录数;UV:distinct userId
+            // 1. 用户访问情况(近30天按日汇总 PV/UV)
+            // PV = 文章阅读次数(每条阅读记录计 1 次);UV = 当日去重读者数(distinct userId)。
+            // 修复:此前 UV 直接复用 PV 计数(counts[1]++),导致 PV/UV 曲线与 KPI 恒等。
             List<ArticleReadingRecord> readingRecords = articleReadingRecordMapper.selectList(
                     new LambdaQueryWrapper<ArticleReadingRecord>().ge(ArticleReadingRecord::getReadAt, thirtyDaysAgo));
-            Map<String, int[]> pvUvMap = new LinkedHashMap<>();
+            Map<String, Integer> pvMap = new LinkedHashMap<>();
+            Map<String, Set<Long>> uvMap = new LinkedHashMap<>();
             for (int i = 29; i >= 0; i--) {
                 Calendar dayCal = Calendar.getInstance();
                 dayCal.add(Calendar.DAY_OF_MONTH, -i);
-                dayCal.set(Calendar.HOUR_OF_DAY, 0); dayCal.set(Calendar.MINUTE, 0);
-                dayCal.set(Calendar.SECOND, 0); dayCal.set(Calendar.MILLISECOND, 0);
-                Date dayStart = dayCal.getTime();
-                dayCal.set(Calendar.HOUR_OF_DAY, 23); dayCal.set(Calendar.MINUTE, 59); dayCal.set(Calendar.SECOND, 59);
-                Date dayEnd = dayCal.getTime();
-                String dayKey = dayFmt.format(dayStart);
-                int[] counts = pvUvMap.computeIfAbsent(dayKey, k -> new int[]{0, 0});
-                for (ArticleReadingRecord r : readingRecords) {
-                    if (r.getReadAt() != null && r.getReadAt().after(dayStart) && r.getReadAt().before(dayEnd)) {
-                        counts[0]++;
-                        counts[1]++; // 简化:按记录数计UV,精确UV需distinct
-                    }
-                }
+                String dayKey = dayFmt.format(dayCal.getTime());
+                pvMap.put(dayKey, 0);
+                uvMap.put(dayKey, new java.util.HashSet<>());
             }
-            // 用 distinct userId 修正 UV
-            Set<Long> dailyUv = new java.util.HashSet<>();
             for (ArticleReadingRecord r : readingRecords) {
-                if (r.getReadAt() != null && r.getReadAt().after(thirtyDaysAgo)) {
-                    dailyUv.add(r.getUserId());
+                if (r.getReadAt() == null) continue;
+                String dayKey = dayFmt.format(r.getReadAt());
+                if (!pvMap.containsKey(dayKey)) continue;
+                pvMap.merge(dayKey, 1, Integer::sum);
+                if (r.getUserId() != null) {
+                    uvMap.get(dayKey).add(r.getUserId());
                 }
             }
-            List<String> trafficDates = new ArrayList<>(pvUvMap.keySet());
+            List<String> trafficDates = new ArrayList<>(pvMap.keySet());
             List<Integer> pvData = new ArrayList<>();
             List<Integer> uvData = new ArrayList<>();
+            int monthPvTotal = 0;
             for (String d : trafficDates) {
-                pvData.add(pvUvMap.get(d)[0]);
-                uvData.add(pvUvMap.get(d)[1]);
+                pvData.add(pvMap.get(d));
+                uvData.add(uvMap.get(d).size());
+                monthPvTotal += pvMap.get(d);
             }
+            Set<Long> dailyUv = new java.util.HashSet<>();
+            for (Set<Long> s : uvMap.values()) dailyUv.addAll(s);
             data.put("trafficDates", trafficDates);
             data.put("pvData", pvData);
             data.put("uvData", uvData);
-            // 今日实时数据
-            Calendar todayCal = Calendar.getInstance();
-            todayCal.set(Calendar.HOUR_OF_DAY, 0); todayCal.set(Calendar.MINUTE, 0);
-            todayCal.set(Calendar.SECOND, 0); todayCal.set(Calendar.MILLISECOND, 0);
-            long todayPv = readingRecords.stream()
-                    .filter(r -> r.getReadAt() != null && r.getReadAt().after(todayCal.getTime()))
-                    .count();
-            long todayUv = readingRecords.stream()
-                    .filter(r -> r.getReadAt() != null && r.getReadAt().after(todayCal.getTime()))
-                    .map(ArticleReadingRecord::getUserId)
-                    .distinct().count();
+            // 今日实时数据(与趋势图同一口径,避免 KPI 与曲线对不上)
+            String todayKey = dayFmt.format(new Date());
+            long todayPv = pvMap.getOrDefault(todayKey, 0);
+            long todayUv = uvMap.getOrDefault(todayKey, java.util.Collections.emptySet()).size();
             Map<String, Object> visitSummary = new HashMap<>();
             visitSummary.put("todayPv", todayPv);
             visitSummary.put("todayUv", todayUv);
-            visitSummary.put("monthPv", readingRecords.size());
+            visitSummary.put("monthPv", monthPvTotal);
             visitSummary.put("monthUv", dailyUv.size());
             data.put("visitSummary", visitSummary);
 
@@ -624,7 +624,7 @@ public class StatsController {
             Map<Long, Set<Long>> artReaders = new HashMap<>();
             for (ArticleReadingRecord r : articleReads) {
                 long[] a = artAgg.computeIfAbsent(r.getArticleId(), k -> new long[]{0, 0});
-                a[0] += (r.getDurationSeconds() != null ? r.getDurationSeconds() : 0);
+                a[0] += saneDwell(r.getDurationSeconds());
                 a[1] += 1;
                 if (r.getUserId() != null) {
                     artReaders.computeIfAbsent(r.getArticleId(), k -> new HashSet<>()).add(r.getUserId());
@@ -653,7 +653,7 @@ public class StatsController {
             Map<Long, Long> userDwellMap = new HashMap<>();
             for (ArticleReadingRecord r : articleReads) {
                 if (r.getUserId() != null && r.getDurationSeconds() != null) {
-                    userDwellMap.merge(r.getUserId(), (long) r.getDurationSeconds(), Long::sum);
+                    userDwellMap.merge(r.getUserId(), saneDwell(r.getDurationSeconds()), Long::sum);
                 }
             }
             List<ShareRead> shareReads = shareReadMapper.selectList(
@@ -662,7 +662,7 @@ public class StatsController {
                             .isNotNull(ShareRead::getReadDuration));
             for (ShareRead s : shareReads) {
                 if (s.getReaderId() != null && s.getReadDuration() != null) {
-                    userDwellMap.merge(s.getReaderId(), (long) s.getReadDuration(), Long::sum);
+                    userDwellMap.merge(s.getReaderId(), saneDwell(s.getReadDuration()), Long::sum);
                 }
             }
             Map<Long, String> userNameMap = new HashMap<>();
@@ -695,7 +695,7 @@ public class StatsController {
             Map<Long, long[]> prodAgg = new LinkedHashMap<>();
             for (ProductViewRecord r : productViews) {
                 long[] a = prodAgg.computeIfAbsent(r.getProductId(), k -> new long[]{0, 0});
-                a[0] += (r.getDurationSeconds() != null ? r.getDurationSeconds() : 0);
+                a[0] += saneDwell(r.getDurationSeconds());
                 a[1] += 1;
             }
             List<Map<String, Object>> productDwellList = new ArrayList<>();
@@ -726,14 +726,14 @@ public class StatsController {
                 if (r.getReadAt() != null && r.getDurationSeconds() != null) {
                     hourCal.setTime(r.getReadAt());
                     int h = hourCal.get(Calendar.HOUR_OF_DAY);
-                    if (h >= 0 && h < 24) dwellByHour[h] += r.getDurationSeconds();
+                    if (h >= 0 && h < 24) dwellByHour[h] += saneDwell(r.getDurationSeconds());
                 }
             }
             for (ProductViewRecord r : productViews) {
                 if (r.getViewAt() != null && r.getDurationSeconds() != null) {
                     hourCal.setTime(r.getViewAt());
                     int h = hourCal.get(Calendar.HOUR_OF_DAY);
-                    if (h >= 0 && h < 24) dwellByHour[h] += r.getDurationSeconds();
+                    if (h >= 0 && h < 24) dwellByHour[h] += saneDwell(r.getDurationSeconds());
                 }
             }
             List<Long> dwellByHourList = new ArrayList<>();
@@ -761,7 +761,11 @@ public class StatsController {
             if (record == null || record.getProductId() == null) {
                 return Result.error("参数缺失");
             }
-            if (record.getDurationSeconds() == null) record.setDurationSeconds(0);
+            // 防御:埋点异常(如未 start 就 flush)会传出 epoch 量级的天文数字,入库前收敛到合理区间
+            int dwellSeconds = record.getDurationSeconds() == null ? 0 : record.getDurationSeconds();
+            if (dwellSeconds < 0) dwellSeconds = 0;
+            if (dwellSeconds > MAX_DWELL_SECONDS) dwellSeconds = MAX_DWELL_SECONDS;
+            record.setDurationSeconds(dwellSeconds);
             if (record.getUserId() == null) record.setUserId(0L);
             if (record.getSource() == null) record.setSource("miniprogram");
             record.setViewAt(new Date());

+ 4 - 0
cfc-frontend/utils/dwellTracker.js

@@ -15,8 +15,12 @@ export function flushProductDwell(product) {
   var start = _startTs
   _startTs = 0
   if (!product || !product.id) return
+  // 未调用 startProductDwell 时不得上报:此前 start=0 会把 Date.now() 当成停留时长(≈17 亿秒)
+  if (!start) return
   var duration = Math.round((Date.now() - start) / 1000)
   if (duration <= 0) return
+  // 单次停留上限 30 分钟:小程序切后台/锁屏时计时仍在走,避免产生超长时长
+  if (duration > 1800) duration = 1800
   var userId = 0
   try {
     userId = uni.getStorageSync('userId') || 0

+ 27 - 5
cfc-web/src/views/Dashboard.vue

@@ -54,7 +54,7 @@
 
     <!-- 内容吸引力 · 停留时长 Top(运营核心关注) -->
     <SectionTitle title="内容吸引力 · 停留时长 Top" desc="基于用户真实停留时长(秒)统计,反映内容深度吸引力" />
-    <el-row :gutter="24" class="dwell-row">
+    <el-row :gutter="24" class="dwell-row" type="flex">
       <el-col v-for="sec in dwellSections" :key="sec.key" :xs="24" :sm="24" :md="8">
         <div class="dwell-card">
           <div class="dwell-card__head">
@@ -122,7 +122,7 @@
 
     <!-- 内容广度 · 热度排行 -->
     <SectionTitle title="内容广度 · 热度排行" desc="以下均基于用户真实行为数据(实际阅读记录 / 真实成交订单 / 真实分享点击),不使用文章浏览计数等虚高指标" />
-    <el-row :gutter="24" class="hot-row">
+    <el-row :gutter="24" class="hot-row" type="flex">
       <el-col v-for="sec in hotSections" :key="sec.key" :xs="24" :sm="24" :md="8">
         <div class="hot-card">
           <div class="hot-card__head">
@@ -154,7 +154,7 @@
         <el-card class="chart-card" v-loading="trafficLoading" shadow="never">
           <div slot="header" class="card-header">
             <span class="card-title">近 30 天访问趋势(PV / UV)</span>
-            <span class="card-tip">数据已实时采集</span>
+            <span class="card-tip">PV = 阅读次数 · UV = 当日去重读者 · 实时采集</span>
           </div>
           <div ref="pvUvChart" class="echarts-container"></div>
         </el-card>
@@ -170,7 +170,7 @@
     </el-row>
 
     <!-- 最近任务 + 系统状态 -->
-    <el-row :gutter="24" class="content-row">
+    <el-row :gutter="24" class="content-row" type="flex">
       <el-col :xs="24" :md="14">
         <el-card class="content-card" shadow="never">
           <div slot="header" class="card-header">
@@ -754,6 +754,11 @@ export default {
   --adm-primary-grad-from: #69B1FF;
   --adm-warning-grad-from: #FFC53D;
   padding: 0;
+  /* 首页内容多,不参与全局「表格页撑满」链::has(.adm-table-wrap) 会把本页压成一屏高度,
+     导致「最近任务」表格被压缩、高度不足。恢复自然文档流,由 .el-main 滚动。 */
+  flex: 0 0 auto !important;
+  display: block !important;
+  min-height: 0 !important;
 }
 
 .dashboard__title {
@@ -886,8 +891,15 @@ export default {
   box-shadow: var(--adm-shadow-card);
   padding: 20px;
   margin-bottom: 24px;
-  height: 100%;
+  /* 同一行卡片等高;min-height 保证数据缺失时也有统一默认高度,避免参差 */
+  flex: 1 1 auto;
+  min-height: 420px;
 }
+
+/* 栅格列改为弹性容器,卡片才能被拉伸到与同行最高卡片一致 */
+.dwell-row > .el-col,
+.hot-row > .el-col,
+.content-row > .el-col { display: flex; }
 .dwell-card__head,
 .hot-card__head {
   display: flex;
@@ -1140,6 +1152,16 @@ export default {
   border-radius: var(--adm-radius-card);
   border: 1px solid var(--adm-border-split);
   margin-bottom: 24px;
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+}
+/* 卡片正文撑满:最近任务表格随系统状态卡片同高 */
+.content-card ::v-deep .el-card__body {
+  flex: 1 1 auto;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
 }
 .custom-table ::v-deep .el-table__header th {
   background: var(--adm-bg-header);