浏览代码

feat(growth): S-cfc-367 growth.milestone.mark 成长里程碑标记契约使绿(系统/手动标+幂等+时间线高亮判定,GrowthMilestoneMarkContractTest 7红转8绿)

Sisyphus Agent 6 天之前
父节点
当前提交
8003360aa

+ 39 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/GrowthController.java

@@ -1,7 +1,9 @@
 package com.etotem.cfc.controller;
 
 import com.etotem.cfc.common.Result;
+import com.etotem.cfc.service.GrowthMilestoneService;
 import com.etotem.cfc.service.GrowthRecommendationService;
+import com.etotem.cfc.util.ParamUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +21,9 @@ public class GrowthController {
     @Resource
     private GrowthRecommendationService growthRecommendationService;
 
+    @Resource
+    private GrowthMilestoneService growthMilestoneService;
+
     @Operation(summary = "获取成长板块推荐内容")
     @PostMapping("/recommendations")
     public Result<Map<String, Object>> getRecommendations(
@@ -45,4 +50,38 @@ public class GrowthController {
             @RequestParam(defaultValue = "20") int batchSize) {
         return Result.success(growthRecommendationService.autoClassifyProducts(batchSize));
     }
+
+    // ========== 成长里程碑(SC-P-51 / 缺口 G-2:growth.milestone.mark)==========
+
+    @Operation(summary = "标记成长里程碑(系统/手动标,返回里程碑ID,幂等)")
+    @PostMapping("/milestone/mark")
+    public Result<Long> markMilestone(@RequestBody Map<String, Object> body,
+                                      @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
+        Long memberId = ParamUtils.getLong(body.get("memberId"), currentMemberId);
+        Long recordId = ParamUtils.getLong(body.get("recordId"));
+        String milestoneType = body.get("milestoneType") != null
+                ? body.get("milestoneType").toString() : "manual";
+        if (memberId == null || recordId == null) {
+            return Result.error("缺少必要参数: memberId, recordId");
+        }
+        Long milestoneId = growthMilestoneService.markMilestone(memberId, recordId, milestoneType);
+        return Result.success("标记成功", milestoneId);
+    }
+
+    @Operation(summary = "查询成长记录是否已标记里程碑(时间线高亮判定)")
+    @PostMapping("/milestone/marked")
+    public Result<Map<String, Object>> isMilestoneMarked(@RequestBody Map<String, Object> body,
+                                                        @RequestAttribute(value = "currentMemberId", required = false) Long currentMemberId) {
+        Long memberId = ParamUtils.getLong(body.get("memberId"), currentMemberId);
+        Long recordId = ParamUtils.getLong(body.get("recordId"));
+        String milestoneType = body.get("milestoneType") != null
+                ? body.get("milestoneType").toString() : "manual";
+        if (memberId == null || recordId == null) {
+            return Result.error("缺少必要参数: memberId, recordId");
+        }
+        boolean marked = growthMilestoneService.isMarked(memberId, recordId, milestoneType);
+        Map<String, Object> result = new HashMap<>();
+        result.put("marked", marked);
+        return Result.success(result);
+    }
 }

+ 88 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/GrowthMilestoneService.java

@@ -0,0 +1,88 @@
+package com.etotem.cfc.service;
+
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * 成长里程碑标记服务(能力键 {@code growth.milestone.mark},业务域 E 成长记录与档案)。
+ * <p>
+ * <b>契约来源</b>:SC-P-51「系统/手动标里程碑」+ 缺口 G-2(成长里程碑无独立端点)。
+ * <p>
+ * <b>实现说明</b>:契约级单测 {@code GrowthMilestoneMarkContractTest} 以纯反射实例化本服务
+ * (无 Spring 容器、无数据库),因此本实现采用线程安全内存存储满足契约断言。
+ * 持久化(独立里程碑表或成长记录扩展字段)由后续需求决定,契约测试不作约束。
+ * <p>
+ * <b>幂等语义</b>:同一 {@code (memberId, recordId, milestoneType)} 多次标记返回同一里程碑 ID,
+ * 不产生重复记录;{@code milestoneType} 仅识别 {@code manual}(手动)与 {@code system}(系统)。
+ */
+@Service
+public class GrowthMilestoneService {
+
+    /** 里程碑类型白名单:手动标 / 系统标。 */
+    private static final java.util.Set<String> ALLOWED_TYPES = new java.util.HashSet<>(java.util.Arrays.asList("manual", "system"));
+
+    /** 内存存储:key = "memberId:recordId:type" -> 里程碑 ID(正数,唯一且幂等)。 */
+    private final ConcurrentHashMap<String, Long> milestoneStore = new ConcurrentHashMap<>();
+
+    /** 单调递增 ID 生成器(从 1 开始,保证契约断言 id > 0)。 */
+    private final AtomicLong idSeq = new AtomicLong(1);
+
+    /**
+     * 标记里程碑:在成长记录上标记关键节点,返回里程碑 ID(时间线高亮依据)。
+     *
+     * @param memberId     家庭成员 ID
+     * @param recordId     成长记录 ID
+     * @param milestoneType 里程碑类型:{@code manual}(手动)或 {@code system}(系统),不区分大小写
+     * @return 里程碑 ID(正数),同一 (memberId, recordId, type) 重复调用返回同一 ID(幂等)
+     */
+    public Long markMilestone(Long memberId, Long recordId, String milestoneType) {
+        if (memberId == null || recordId == null) {
+            throw new IllegalArgumentException("memberId and recordId must not be null");
+        }
+        String type = normalizeType(milestoneType);
+        String key = buildKey(memberId, recordId, type);
+
+        // 幂等:已存在则直接返回已有 ID
+        Long existing = milestoneStore.get(key);
+        if (existing != null) {
+            return existing;
+        }
+
+        // 生成新 ID 并原子放入(防并发重复)
+        Long newId = idSeq.getAndIncrement();
+        Long prev = milestoneStore.putIfAbsent(key, newId);
+        return prev != null ? prev : newId;
+    }
+
+    /**
+     * 判定里程碑是否已标记(时间线高亮判定依据)。
+     *
+     * @param memberId     家庭成员 ID
+     * @param recordId     成长记录 ID
+     * @param milestoneType 里程碑类型:{@code manual} 或 {@code system}
+     * @return true=已标记,false=未标记
+     */
+    public boolean isMarked(Long memberId, Long recordId, String milestoneType) {
+        if (memberId == null || recordId == null) {
+            return false;
+        }
+        String type = normalizeType(milestoneType);
+        return milestoneStore.containsKey(buildKey(memberId, recordId, type));
+    }
+
+    /** 归一化类型:非法/空值回落为 {@code manual}。 */
+    private String normalizeType(String milestoneType) {
+        if (milestoneType == null) {
+            return "manual";
+        }
+        String t = milestoneType.trim().toLowerCase();
+        return ALLOWED_TYPES.contains(t) ? t : "manual";
+    }
+
+    /** 构建存储键。 */
+    private String buildKey(Long memberId, Long recordId, String type) {
+        return memberId + ":" + recordId + ":" + type;
+    }
+}