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

feat(workbench): 趋势序列生成器 + 工作台 DTO

Xiaogang Liao пре 1 недеља
родитељ
комит
959807803f

+ 14 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/FamilyWorkbenchCard.java

@@ -0,0 +1,14 @@
+package com.etotem.cfc.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/** 单家庭工作台-指标卡(总额 + 近 30 天逐日序列) */
+@Data
+public class FamilyWorkbenchCard {
+    private String key;
+    private String label;
+    private Long total;
+    private List<FamilyWorkbenchSeriesPoint> series;
+}

+ 13 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/FamilyWorkbenchDTO.java

@@ -0,0 +1,13 @@
+package com.etotem.cfc.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/** 单家庭运营工作台:家庭信息 + 6 张指标卡 */
+@Data
+public class FamilyWorkbenchDTO {
+    private Map<String, Object> family;
+    private List<FamilyWorkbenchCard> cards;
+}

+ 10 - 0
cfc-backend/src/main/java/com/etotem/cfc/dto/FamilyWorkbenchSeriesPoint.java

@@ -0,0 +1,10 @@
+package com.etotem.cfc.dto;
+
+import lombok.Data;
+
+/** 单家庭工作台-趋势序列点(date=yyyy-MM-dd, value=当日聚合值) */
+@Data
+public class FamilyWorkbenchSeriesPoint {
+    private String date;
+    private Long value;
+}

+ 56 - 0
cfc-backend/src/main/java/com/etotem/cfc/util/FamilyWorkbenchSeriesBuilder.java

@@ -0,0 +1,56 @@
+package com.etotem.cfc.util;
+
+import com.etotem.cfc.dto.FamilyWorkbenchSeriesPoint;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 单家庭工作台-近 N 天逐日序列纯函数。
+ * rows 元素 {@code {"d": <String|Date|LocalDate>, "c": <Number>}}:同日多行求和、null/非法日期跳过、缺日 0 填充。
+ */
+public final class FamilyWorkbenchSeriesBuilder {
+
+    private FamilyWorkbenchSeriesBuilder() {
+    }
+
+    public static List<FamilyWorkbenchSeriesPoint> buildDailySeries(LocalDate fromInclusive,
+                                                                    LocalDate toInclusive,
+                                                                    List<Map<String, Object>> rows) {
+        List<FamilyWorkbenchSeriesPoint> out = new ArrayList<>();
+        LocalDate cur = fromInclusive;
+        while (!cur.isAfter(toInclusive)) {
+            long sum = 0;
+            for (Map<String, Object> r : rows) {
+                LocalDate rd = toLocalDate(r.get("d"));
+                if (rd != null && rd.equals(cur) && r.get("c") instanceof Number) {
+                    sum += ((Number) r.get("c")).longValue();
+                }
+            }
+            FamilyWorkbenchSeriesPoint p = new FamilyWorkbenchSeriesPoint();
+            p.setDate(cur.toString());
+            p.setValue(sum);
+            out.add(p);
+            cur = cur.plusDays(1);
+        }
+        return out;
+    }
+
+    private static LocalDate toLocalDate(Object v) {
+        if (v == null) return null;
+        if (v instanceof LocalDate) return (LocalDate) v;
+        if (v instanceof java.sql.Date) return ((java.sql.Date) v).toLocalDate();
+        if (v instanceof java.util.Date) return ((java.util.Date) v).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        if (v instanceof String) {
+            try {
+                return LocalDate.parse((String) v);
+            } catch (Exception e) {
+                return null;
+            }
+        }
+        return null;
+    }
+}

+ 81 - 0
cfc-backend/src/test/java/com/etotem/cfc/util/FamilyWorkbenchSeriesBuilderTest.java

@@ -0,0 +1,81 @@
+package com.etotem.cfc.util;
+
+import com.etotem.cfc.dto.FamilyWorkbenchSeriesPoint;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * 单家庭工作台「近 30 天逐日序列」纯函数契约:
+ * 稀疏/缺日 0 填充、同日多行求和、跨月框架、null 日期跳过。
+ */
+class FamilyWorkbenchSeriesBuilderTest {
+
+    private Map<String, Object> row(String d, long c) {
+        Map<String, Object> m = new HashMap<>();
+        m.put("d", d);
+        m.put("c", c);
+        return m;
+    }
+
+    @Test
+    void 空数据_生成全零30天序列() {
+        List<FamilyWorkbenchSeriesPoint> pts = FamilyWorkbenchSeriesBuilder.buildDailySeries(
+                LocalDate.of(2026, 10, 15), LocalDate.of(2026, 11, 13), new ArrayList<>());
+        assertEquals(30, pts.size());
+        assertEquals("2026-10-15", pts.get(0).getDate());
+        assertEquals("2026-11-13", pts.get(29).getDate());
+        for (FamilyWorkbenchSeriesPoint p : pts) assertEquals(0L, p.getValue());
+    }
+
+    @Test
+    void 稀疏数据_缺日零填充且值位置正确() {
+        List<Map<String, Object>> rows = new ArrayList<>();
+        rows.add(row("2026-10-20", 3L));
+        rows.add(row("2026-11-01", 5L));
+        List<FamilyWorkbenchSeriesPoint> pts = FamilyWorkbenchSeriesBuilder.buildDailySeries(
+                LocalDate.of(2026, 10, 15), LocalDate.of(2026, 11, 13), rows);
+        assertEquals(0L, pts.get(0).getValue());   // 10-15 无数据
+        assertEquals(3L, pts.get(5).getValue());   // 10-20
+        assertEquals(0L, pts.get(16).getValue());  // 10-31 无数据
+        assertEquals(5L, pts.get(17).getValue());  // 11-01
+        assertEquals(0L, pts.get(29).getValue());  // 11-13 无数据
+    }
+
+    @Test
+    void 同日多行_求和() {
+        List<Map<String, Object>> rows = new ArrayList<>();
+        rows.add(row("2026-11-05", 2L));
+        rows.add(row("2026-11-05", 3L));
+        List<FamilyWorkbenchSeriesPoint> pts = FamilyWorkbenchSeriesBuilder.buildDailySeries(
+                LocalDate.of(2026, 11, 1), LocalDate.of(2026, 11, 5), rows);
+        assertEquals(5L, pts.get(4).getValue());
+    }
+
+    @Test
+    void 跨月框架与null日期跳过() {
+        List<Map<String, Object>> rows = new ArrayList<>();
+        Map<String, Object> bad = new HashMap<>();
+        bad.put("d", null);
+        bad.put("c", 1L);
+        rows.add(bad);
+        rows.add(row("2026-10-31", 7L));
+        rows.add(row("2026-11-01", 9L));
+        List<FamilyWorkbenchSeriesPoint> pts = FamilyWorkbenchSeriesBuilder.buildDailySeries(
+                LocalDate.of(2026, 10, 31), LocalDate.of(2026, 11, 30), rows);
+        assertEquals(31, pts.size());
+        assertEquals(7L, pts.get(0).getValue());   // 10-31
+        assertEquals(9L, pts.get(1).getValue());   // 11-01
+        assertEquals("2026-11-10", pts.get(10).getDate());
+        assertEquals(0L, pts.get(10).getValue()); // null 日期行不参与任何日期的计数
+        // 校验 11-30 在最后
+        assertEquals("2026-11-30", pts.get(30).getDate());
+        assertEquals(0L, pts.get(30).getValue());
+    }
+}