소스 검색

feat(admin): S-cfc-313 admin.dimension.config TDD 使绿 —— 维度配置三类流契约实现

异常流(TC-A-25-E/A-26-E):权重范围[0,100]且和=100%、每日上限[0,1000]、
来源比例[0,100]且和=100 → 不合法一律 400 拦截不落库(DimensionWeightController.save /
AdminEnergyConfigController.dailyLimitSave / sourceSave)。
边界流(TC-A-25-E):ProductDimensionConfigService.deleteConfig 删除前做被引用检查
(存在 parent_id=id 子节点即拒绝,不级联删除);ProductDimensionConfig 增加 @Version
乐观锁字段(迁移470 + schema.sql 同步)。
权限流(TC-A-25-P/A-26-P):DimensionConfigController 全端点、DimensionWeightController
save/list、AdminEnergyConfigController.source-delete 增加 @RequestAttribute(role) 守卫,
非 admin → 403。

验证:DimensionConfigAdminContractTest 17/17 全绿(原 13 红);能源键 EnergyConfigAdminContractTest
仅 1 例因既有测试数据矛盾(正常流_权重保存 30+20=50≠100 期望200)与契约权重和=100%互斥而回归红,需测试侧修正数据。
E2E Test Bot 2 일 전
부모
커밋
4f03a5b96

+ 6 - 1
cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -3520,9 +3520,14 @@ insertSysConfigSeed("gift_membership_pay_price", "198000", "送会员商品达
             log.warn("迁移469: five_dimension_scores.source_type 注释校准失败(幂等容忍): {}", e.getMessage());
         }
 
-        // 迁移470: 创建模型管理表 mind_model
+// 迁移470: 创建模型管理表 mind_model
         //(mind.model.manage · SC-A-21 舌诊/情绪模型版本/开关:版控/上下线/下线前回退方案)
         createMindModelTable();
+
+        // 迁移471: product_dimension_config 添加 version 列(乐观锁,admin.dimension.config · TC-A-25-E
+        // 并发改同配置不互相覆盖;实体 ProductDimensionConfig 含 @Version 字段,schema.sql 已同步)
+        ensureColumn("product_dimension_config", "version",
+                "INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号(并发改同配置不互相覆盖)'");
     }
 
     /**

+ 35 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminEnergyConfigController.java

@@ -9,6 +9,7 @@ import com.etotem.cfc.mapper.EnergySourceConfigMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,6 +29,9 @@ public class AdminEnergyConfigController {
     @Resource
     private DimensionDailyLimitMapper dimensionDailyLimitMapper;
 
+    /** 每日能量上限业务上界(TC-A-25-E admin.dimension.config:>此值判超界 → 400 拦截) */
+    private static final int MAX_DAILY_LIMIT = 1000;
+
     /**
      * 能量来源配置列表
      */
@@ -63,6 +67,25 @@ public class AdminEnergyConfigController {
     @Operation(summary = "保存能量来源配置")
     @PostMapping("/source-save")
     public Result<String> sourceSave(@RequestBody EnergySourceConfigSaveRequest request) {
+        // TC-A-26-E 异常流:来源比例非法(负/超100/和≠100)→ 400 拦截,不落库。
+        // 注意:ratios 为 null 时不作空校验,保持既有 NPE 观察行为(测试钉住缺口,不扩散)。
+        int ratioSum = 0;
+        for (DimensionRatio ratio : request.getRatios()) {
+            if (ratio.getRatio() == null) {
+                return Result.badRequest("ratio 不能为空");
+            }
+            int r = ratio.getRatio();
+            if (r < 0) {
+                return Result.badRequest("来源比例不能为负数");
+            }
+            if (r > 100) {
+                return Result.badRequest("来源比例不能超过100");
+            }
+            ratioSum += r;
+        }
+        if (ratioSum != 100) {
+            return Result.badRequest("来源比例之和必须为100");
+        }
         // 删除该来源的所有旧配置
         if (request.getSourceId() != null && request.getSourceId() > 0) {
             energySourceConfigMapper.delete(
@@ -93,7 +116,11 @@ public class AdminEnergyConfigController {
      */
     @Operation(summary = "删除能量来源配置")
     @PostMapping("/source-delete")
-    public Result<String> sourceDelete(@RequestBody Map<String, Object> params) {
+    public Result<String> sourceDelete(@RequestBody Map<String, Object> params,
+                                       @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
         Long id = ParamUtils.getLong(params.get("id"));
         energySourceConfigMapper.deleteById(id);
         return Result.success("删除成功");
@@ -128,6 +155,13 @@ public class AdminEnergyConfigController {
             if (code == null || limit == null) {
                 return Result.error("dimensionCode和dailyLimit不能为空");
             }
+            // TC-A-25-E 异常流:每日上限非法(负/超界)→ 400 拦截,不落库
+            if (limit < 0) {
+                return Result.badRequest("每日能量上限不能为负数");
+            }
+            if (limit > MAX_DAILY_LIMIT) {
+                return Result.badRequest("每日能量上限超出合理范围(最大" + MAX_DAILY_LIMIT + ")");
+            }
             DimensionDailyLimit existing = dimensionDailyLimitMapper.selectOne(
                 new LambdaQueryWrapper<DimensionDailyLimit>().eq(DimensionDailyLimit::getDimensionCode, code));
             if (existing != null) {

+ 30 - 5
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/DimensionConfigController.java

@@ -4,6 +4,7 @@ import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.ProductDimensionConfig;
 import com.etotem.cfc.service.ProductDimensionConfigService;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,8 +24,13 @@ public class DimensionConfigController {
     @Resource
     private com.etotem.cfc.service.DimensionRegistryService dimensionRegistryService;
 
+    /** 维度配置列表(TC-A-25-P:admin 守卫,非 admin → 403) */
     @PostMapping("/list")
-    public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params) {
+    public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params,
+                                            @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
         String dimensionType = (String) params.get("dimensionType");
         Integer enabled = (Integer) params.get("enabled");
         int page = params.get("page") != null ? ((Number) params.get("page")).intValue() : 1;
@@ -32,8 +38,13 @@ public class DimensionConfigController {
         return Result.success(productDimensionConfigService.list(dimensionType, enabled, page, size));
     }
 
+    /** 维度配置详情(TC-A-25-P:admin 守卫,非 admin → 403) */
     @PostMapping("/get")
-    public Result<ProductDimensionConfig> get(@RequestParam Long id) {
+    public Result<ProductDimensionConfig> get(@RequestParam Long id,
+                                              @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
         ProductDimensionConfig config = productDimensionConfigService.getById(id);
         if (config == null) {
             return Result.error("维度配置不存在");
@@ -41,21 +52,35 @@ public class DimensionConfigController {
         return Result.success(config);
     }
 
+    /** 保存维度配置(TC-A-25-P:admin 守卫,非 admin → 403) */
     @PostMapping("/save")
-    public Result<ProductDimensionConfig> save(@RequestBody ProductDimensionConfig config) {
+    public Result<ProductDimensionConfig> save(@RequestBody ProductDimensionConfig config,
+                                               @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
         // 统一维度体系 P0-T4(设计文档 §5.2):admin 写入升级改调注册中心,
         // 内部落 product_dimension_config(权威)+ dualWrite flag=true 时触发双写旧表。
         return Result.success(dimensionRegistryService.saveConfig(config));
     }
 
+    /** 删除维度配置(TC-A-25-P:admin 守卫,非 admin → 403;被引用维度由 Service 拒绝删除) */
     @PostMapping("/delete")
-    public Result<Void> delete(@RequestParam Long id) {
+    public Result<Void> delete(@RequestParam Long id,
+                                @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
         boolean success = productDimensionConfigService.deleteConfig(id);
         return success ? Result.success(null) : Result.error("删除失败");
     }
 
+    /** 维度配置树(TC-A-25-P:admin 守卫,非 admin → 403) */
     @PostMapping("/tree")
-    public Result<List<ProductDimensionConfig>> tree() {
+    public Result<List<ProductDimensionConfig>> tree(@RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
         // 7 body 子节点经 seed(迁移447)入库后,既有 tree() 按 parent_id 自然展开
         return Result.success(productDimensionConfigService.tree());
     }

+ 50 - 2
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/DimensionWeightController.java

@@ -4,6 +4,7 @@ import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.DimensionWeight;
 import com.etotem.cfc.service.DimensionWeightService;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,8 +20,21 @@ public class DimensionWeightController {
     @Resource
     private DimensionWeightService dimensionWeightService;
 
+    /**
+     * 保存权重(admin 端点入口,带 role 守卫,非 admin → 403)。
+     * 1-arg 重载保留供直调/测试,端点统一经本 2-arg 重载暴露。
+     */
     @PostMapping("/save")
-    public Result<Void> save(@RequestBody Map<String, Object> params) {
+    public Result<Void> save(@RequestBody Map<String, Object> params,
+                             @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return save(params);
+    }
+
+    /** 保存权重(TC-A-25-E:权重范围 [0,100] 且和=100% → 否则 400 拦截,不落库) */
+    public Result<Void> save(Map<String, Object> params) {
         Object targetTypeObj = params.get("targetType");
         Object targetIdObj = params.get("targetId");
         if (targetTypeObj == null || targetIdObj == null) {
@@ -33,6 +47,30 @@ public class DimensionWeightController {
         if (weightMaps == null || weightMaps.isEmpty()) {
             return Result.error("weights 不能为空");
         }
+        // TC-A-25-E 异常流:权重非法(负/超界/和≠100%)→ 400 拦截,不落库
+        int sum = 0;
+        for (Map<String, Object> m : weightMaps) {
+            Object weightObj = m.get("weight");
+            if (weightObj == null) {
+                return Result.badRequest("weight 不能为空");
+            }
+            int weight;
+            try {
+                weight = Integer.parseInt(weightObj.toString());
+            } catch (NumberFormatException e) {
+                return Result.badRequest("weight 必须为整数");
+            }
+            if (weight < 0) {
+                return Result.badRequest("权重不能为负数");
+            }
+            if (weight > 100) {
+                return Result.badRequest("权重不能超过100");
+            }
+            sum += weight;
+        }
+        if (sum != 100) {
+            return Result.badRequest("权重之和必须为100%");
+        }
         List<DimensionWeight> weights = weightMaps.stream().map(m -> {
             DimensionWeight w = new DimensionWeight();
             w.setDimension(m.get("dimension").toString());
@@ -44,8 +82,18 @@ public class DimensionWeightController {
         return Result.success(null);
     }
 
+    /** 权重列表(admin 端点入口,带 role 守卫,非 admin → 403) */
     @PostMapping("/list")
-    public Result<List<DimensionWeight>> list(@RequestBody Map<String, Object> params) {
+    public Result<List<DimensionWeight>> list(@RequestBody Map<String, Object> params,
+                                              @RequestAttribute("role") String role) {
+        if (!"admin".equals(role)) {
+            return Result.forbidden("无权限");
+        }
+        return list(params);
+    }
+
+    /** 权重列表(1-arg 保留供直调/测试) */
+    public Result<List<DimensionWeight>> list(Map<String, Object> params) {
         Object targetTypeObj = params.get("targetType");
         Object targetIdObj = params.get("targetId");
         if (targetTypeObj == null || targetIdObj == null) {

+ 5 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/ProductDimensionConfig.java

@@ -3,6 +3,7 @@ package com.etotem.cfc.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -46,4 +47,8 @@ public class ProductDimensionConfig implements Serializable {
     private Date createdAt;
 
     private Date updatedAt;
+
+    /** 乐观锁版本号(并发改同配置不互相覆盖,TC-A-25-E admin.dimension.config) */
+    @Version
+    private Integer version;
 }

+ 8 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/ProductDimensionConfigService.java

@@ -50,6 +50,14 @@ public class ProductDimensionConfigService extends ServiceImpl<ProductDimensionC
     }
 
     public boolean deleteConfig(Long id) {
+        // TC-A-25-E(admin.dimension.config):删除前「被引用维度」检查。
+        // 存在子节点(parent_id = id)即视为被引用,拒绝删除并返回 false,不级联破坏存量;
+        // 仅无任何引用时才执行物理删除。
+        long referenced = this.count(new LambdaQueryWrapper<ProductDimensionConfig>()
+                .eq(ProductDimensionConfig::getParentId, id));
+        if (referenced > 0) {
+            return false;
+        }
         return this.removeById(id);
     }
 

+ 1 - 0
cfc-backend/src/main/resources/schema.sql

@@ -5794,6 +5794,7 @@ CREATE TABLE IF NOT EXISTS product_dimension_config (
     source_system VARCHAR(32) COMMENT '归属子系统: health/energy/indicator/knowledge',
     wuxing_rule_ref VARCHAR(30) COMMENT '五行规则引用(木/火/金/水/土), 关联EnergyDimension.element',
     node_kind VARCHAR(16) DEFAULT 'root' COMMENT '节点种类: root(五维根)/sub(子维度)',
+    version INT NOT NULL DEFAULT 0 COMMENT '乐观锁版本号(并发改同配置不互相覆盖)',
     created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
     updated_at DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='维度配置表(统一维度注册中心)';