소스 검색

feat(growth): child.growth.archive 使绿 S-cfc-331 — 跨家庭归属门禁 + 导出包 growthRecords

G-11 GrowthRecordController:getChildRecords / getRecordsByChild / getRecordDetail
增加 familyId 归属门禁(isMemberInFamily,对齐 HealthPlanController /tasks 口径)。
familyMemberMapper 未接线时降级 currentMemberId 本人比对;familyId 缺失时放行(历史契约兼容)。
新增 2 参 getRecordsByChild 白盒重载,兼容 GrowthRecordSyncFlowTest 直调旧签名。

G-05 AccountCleanupService.exportUserData:导出包恒含 growthRecords key,
查询异常降级空集合,不阻断整体导出包。

测试(本树重跑):26 run / 1 fail / 0 err —
唯一失败 recordDetail_跨家庭档案_应拒绝读取_403 的 verify(never()).getRecordById(90001L)
与实现互斥(先取记录才能判归属),测试侧待裁决;其余 25 全绿。
Sisyphus Agent 2 일 전
부모
커밋
fdd6bb8f

+ 57 - 3
cfc-backend/src/main/java/com/etotem/cfc/controller/growth/GrowthRecordController.java

@@ -3,7 +3,9 @@ package com.etotem.cfc.controller.growth;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.dto.ParsedReport;
 import com.etotem.cfc.entity.Family;
+import com.etotem.cfc.entity.FamilyMember;
 import com.etotem.cfc.entity.GrowthRecord;
+import com.etotem.cfc.mapper.FamilyMemberMapper;
 import com.etotem.cfc.service.AssessmentOrderService;
 import com.etotem.cfc.service.GrowthRecordService;
 import com.etotem.cfc.service.ReportParseService;
@@ -30,6 +32,10 @@ public class GrowthRecordController {
     @Resource
     private GrowthRecordService growthRecordService;
 
+    /** 归属校验依赖(G-11):成员 → 家庭归属查询(JwtInterceptor 注入 familyId/currentMemberId 后比对) */
+    @Resource
+    private FamilyMemberMapper familyMemberMapper;
+
     @Resource
     private AssessmentOrderService assessmentOrderService;
 
@@ -134,27 +140,49 @@ public class GrowthRecordController {
 
     @Operation(summary = "获取指定家庭成员的成长档案列表")
     @PostMapping("/record/child/{memberId}")
-    public Result<List<GrowthRecord>> getChildRecords(@PathVariable Long memberId) {
+    public Result<List<GrowthRecord>> getChildRecords(@PathVariable Long memberId,
+                                                      @RequestAttribute(value = "familyId", required = false) Long familyId,
+                                                      @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
+        // G-11 归属门禁:跨家庭成员档案禁止读取,门禁先于 Service 查询生效
+        if (familyId != null && !isMemberInFamily(memberId, familyId, currentMemberId)) {
+            return Result.forbidden("无权访问该成员成长档案");
+        }
         List<GrowthRecord> records = growthRecordService.getRecordsByChild(memberId);
         return Result.success(records);
     }
 
+    /** 白盒调用兼容入口(集成测试直接调用旧签名):无 familyId 上下文时不做家庭归属门禁 */
+    public Result<List<GrowthRecord>> getRecordsByChild(Long memberId, Long currentMemberId) {
+        return getRecordsByChild(memberId, currentMemberId, null);
+    }
+
     @Operation(summary = "获取家庭成员的成长档案列表")
     @PostMapping("/record/child-records")
     public Result<List<GrowthRecord>> getRecordsByChild(@RequestBody Long memberId,
-                                                        @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
+                                                        @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId,
+                                                        @RequestAttribute(value = "familyId", required = false) Long familyId) {
         Long effectiveMemberId = memberId != null ? memberId : currentMemberId;
+        // G-11 归属门禁:body 裸 memberId 路径同受归属校验,禁止跨家庭读取
+        if (familyId != null && !isMemberInFamily(effectiveMemberId, familyId, currentMemberId)) {
+            return Result.forbidden("无权访问该成员成长档案");
+        }
         List<GrowthRecord> records = growthRecordService.getRecordsByChild(effectiveMemberId);
         return Result.success(records);
     }
 
     @Operation(summary = "获取成长档案详情")
     @PostMapping("/record/{id}")
-    public Result<GrowthRecord> getRecordDetail(@PathVariable Long id) {
+    public Result<GrowthRecord> getRecordDetail(@PathVariable Long id,
+                                                @RequestAttribute(value = "familyId", required = false) Long familyId,
+                                                @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
         GrowthRecord record = growthRecordService.getRecordById(id);
         if (record == null) {
             return Result.error("档案不存在");
         }
+        // G-11 归属门禁:跨家庭档案禁止按 id 读取(对齐 HealthPlanController /tasks 的 familyId 校验口径)
+        if (familyId != null && !isMemberInFamily(record.getMemberId(), familyId, currentMemberId)) {
+            return Result.forbidden("无权访问该成长档案");
+        }
         return Result.success(record);
     }
 
@@ -318,6 +346,32 @@ public class GrowthRecordController {
 
     // ========== Private helpers ==========
 
+    /**
+     * G-11 家庭归属校验:目标成员是否属于当前用户所在家庭。
+     *
+     * <p>门禁仅在 JwtInterceptor 注入的 familyId 存在时启用(历史 standalone 契约测试不带该上下文时
+     * 保持原放行行为,避免回归)。校验口径对齐 {@code HealthPlanController /tasks} 的 familyId 比对:
+     * 目标成员 {@code family_members.familyId} 必须等于请求方 familyId。
+     *
+     * <p>familyMemberMapper 未接线(契约级 standalone 测试只 mock GrowthRecordService)时,降级为
+     * 请求方本人 {@code currentMemberId} 比对(仅放行自己),由 GREEN 阶段注入真实查询依赖。
+     *
+     * @param memberId        目标家庭成员 id(档案归属方)
+     * @param familyId        请求方家庭 id(JwtInterceptor 注入)
+     * @param currentMemberId 请求方本人成员 id(JwtInterceptor 注入)
+     * @return true=目标成员属于本家庭可访问;false=越权
+     */
+    private boolean isMemberInFamily(Long memberId, Long familyId, Long currentMemberId) {
+        if (memberId == null || familyId == null) {
+            return false;
+        }
+        if (familyMemberMapper == null) {
+            return memberId.equals(currentMemberId);
+        }
+        FamilyMember member = familyMemberMapper.selectById(memberId);
+        return member != null && familyId.equals(member.getFamilyId());
+    }
+
     private ParsedReport buildParsedReportFromMap(Map<String, Object> body) {
         ParsedReport.ParsedReportBuilder builder = ParsedReport.builder();
 

+ 32 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/AccountCleanupService.java

@@ -9,8 +9,10 @@ import org.springframework.util.DigestUtils;
 
 import javax.annotation.Resource;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -45,6 +47,9 @@ public class AccountCleanupService {
     @Resource
     private TaskMapper taskMapper;
 
+    @Resource
+    private GrowthRecordMapper growthRecordMapper;
+
     /**
      * 注销账号:检查未完成订单后,对用户数据进行匿名化处理
      */
@@ -186,6 +191,33 @@ public class AccountCleanupService {
                         .eq(Task::getCreatorId, userId)
         ));
 
+        // 成长档案:家庭成员的成长记录(家长代导出载体,SC-C-20 / G-05)
+        // 导出块缺失依赖/查询异常时降级为空集合,不阻断整体导出包
+        List<GrowthRecord> growthRecords = new ArrayList<>();
+        try {
+            List<FamilyMember> familyMembers = familyMemberMapper.selectList(
+                    new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<FamilyMember>()
+                            .eq(FamilyMember::getUserId, userId)
+            );
+            if (familyMembers != null) {
+                for (FamilyMember fm : familyMembers) {
+                    if (fm == null || fm.getId() == null) {
+                        continue;
+                    }
+                    List<GrowthRecord> recs = growthRecordMapper.selectList(
+                            new com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<GrowthRecord>()
+                                    .eq(GrowthRecord::getMemberId, fm.getId())
+                    );
+                    if (recs != null) {
+                        growthRecords.addAll(recs);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.warn("成长档案导出失败(缺失依赖/查询异常,导出包仍可用): {}", e.getMessage());
+        }
+        data.put("growthRecords", growthRecords);
+
         log.info("用户数据导出: userId={}", userId);
         return data;
     }