Просмотр исходного кода

feat(dim): T4 只读接口+admin升级+双写骨架+feature flag

新增 /api/dimension-registry/tree|roots|code/{code}|map 只读接口;
DimensionConfigController.save 经注册中心落库并触发双写(flag门控no-op);
DimensionSyncService flag 骨架;application.yml 加 dimension.registry 配置。
Agnes Agent 1 неделя назад
Родитель
Сommit
a623099bc6

+ 56 - 0
cfc-backend/src/main/java/com/etotem/cfc/controller/DimensionRegistryController.java

@@ -0,0 +1,56 @@
+package com.etotem.cfc.controller;
+
+import com.etotem.cfc.common.Result;
+import com.etotem.cfc.dto.DimensionNode;
+import com.etotem.cfc.service.DimensionCodeMapper;
+import com.etotem.cfc.service.DimensionRegistryService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 统一维度注册中心 —— 只读取数入口(新增,不破坏旧接口)。
+ *
+ * <p>GET /api/dimension-registry/tree | /roots | /code/{code} | /map</p>
+ */
+@RestController
+@RequestMapping("/api/dimension-registry")
+public class DimensionRegistryController {
+
+    @Resource
+    private DimensionRegistryService dimensionRegistryService;
+
+    @Resource
+    private DimensionCodeMapper dimensionCodeMapper;
+
+    @GetMapping("/tree")
+    public Result<List<DimensionNode>> tree(@RequestParam(required = false) String sourceSystem) {
+        return Result.success(sourceSystem == null || sourceSystem.isEmpty()
+                ? dimensionRegistryService.getTree()
+                : dimensionRegistryService.getTree(sourceSystem));
+    }
+
+    @GetMapping("/roots")
+    public Result<List<DimensionNode>> roots() {
+        return Result.success(dimensionRegistryService.getRoots());
+    }
+
+    @GetMapping("/code/{code}")
+    public Result<DimensionNode> code(@PathVariable String code) {
+        DimensionNode node = dimensionRegistryService.getNodeByCode(code);
+        if (node == null) {
+            return Result.error("维度节点不存在: " + code);
+        }
+        return Result.success(node);
+    }
+
+    @GetMapping("/map")
+    public Result<String> map(@RequestParam String legacy) {
+        return Result.success(dimensionCodeMapper.resolveToUnified(legacy));
+    }
+}

+ 13 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/DimensionConfigController.java

@@ -2,6 +2,8 @@ package com.etotem.cfc.controller.admin;
 
 
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.common.Result;
 import com.etotem.cfc.entity.ProductDimensionConfig;
 import com.etotem.cfc.entity.ProductDimensionConfig;
+import com.etotem.cfc.service.DimensionRegistryService;
+import com.etotem.cfc.service.DimensionSyncService;
 import com.etotem.cfc.service.ProductDimensionConfigService;
 import com.etotem.cfc.service.ProductDimensionConfigService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +22,12 @@ public class DimensionConfigController {
     @Resource
     @Resource
     private ProductDimensionConfigService productDimensionConfigService;
     private ProductDimensionConfigService productDimensionConfigService;
 
 
+    @Resource
+    private DimensionRegistryService dimensionRegistryService;
+
+    @Resource
+    private DimensionSyncService dimensionSyncService;
+
     @PostMapping("/list")
     @PostMapping("/list")
     public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params) {
     public Result<Map<String, Object>> list(@RequestBody Map<String, Object> params) {
         String dimensionType = (String) params.get("dimensionType");
         String dimensionType = (String) params.get("dimensionType");
@@ -40,7 +48,11 @@ public class DimensionConfigController {
 
 
     @PostMapping("/save")
     @PostMapping("/save")
     public Result<ProductDimensionConfig> save(@RequestBody ProductDimensionConfig config) {
     public Result<ProductDimensionConfig> save(@RequestBody ProductDimensionConfig config) {
-        return Result.success(productDimensionConfigService.saveConfig(config));
+        // 注册中心权威落库(product_dimension_config 即注册中心表)
+        ProductDimensionConfig saved = dimensionRegistryService.saveConfig(config);
+        // 双写过渡期:flag=true 时同步到旧表(默认关闭,no-op)
+        dimensionSyncService.syncToLegacy(saved);
+        return Result.success(saved);
     }
     }
 
 
     @PostMapping("/delete")
     @PostMapping("/delete")

+ 47 - 0
cfc-backend/src/main/java/com/etotem/cfc/service/DimensionSyncService.java

@@ -0,0 +1,47 @@
+package com.etotem.cfc.service;
+
+import com.etotem.cfc.entity.ProductDimensionConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+/**
+ * 统一维度注册中心 —— 双写同步骨架(feature flag 门控)。
+ *
+ * <p>红线:本服务只做「注册中心 → 旧表」的同步,绝不改旧表结构、绝不改能量五行规则逻辑。
+ * 当 dimension.registry.dualWrite=false(默认)时完全 no-op,旧体系维持权威、行为不变。
+ * 真正按 code 1:1 upsert energy_dimension / energy_dimension_config / dimension_weights 的实现见 P1-T2。</p>
+ */
+@Service
+public class DimensionSyncService {
+
+    private static final Logger log = LoggerFactory.getLogger(DimensionSyncService.class);
+
+    @Value("${dimension.registry.dualWrite:false}")
+    private boolean dualWrite;
+
+    @Value("${dimension.registry.enabled:false}")
+    private boolean enabled;
+
+    /**
+     * 将注册中心节点同步到旧表(双写过渡期)。
+     *
+     * @param node 刚写入 product_dimension_config 的节点
+     */
+    public void syncToLegacy(ProductDimensionConfig node) {
+        if (!enabled) {
+            log.debug("DimensionSyncService: dimension.registry.enabled=false,跳过(节点 {})",
+                    node == null ? null : node.getDimensionCode());
+            return;
+        }
+        if (!dualWrite) {
+            log.debug("DimensionSyncService: dimension.registry.dualWrite=false,跳过双写到旧表(节点 {})",
+                    node == null ? null : node.getDimensionCode());
+            return;
+        }
+        // P1-T2: 按 code 1:1 upsert energy_dimension / energy_dimension_config / dimension_weights
+        log.info("DimensionSyncService: 双写到旧表(节点 {}),实现见 P1-T2",
+                node == null ? null : node.getDimensionCode());
+    }
+}

+ 8 - 0
cfc-backend/src/main/resources/application.yml

@@ -211,6 +211,14 @@ app:
 admin:
 admin:
   skip-captcha: true  # 测试环境跳过验证码,方便自动化测试
   skip-captcha: true  # 测试环境跳过验证码,方便自动化测试
 
 
+# 统一维度注册中心(Unified Dimension Registry)feature flag
+# enabled=false → 新消费者仍回落旧接口/兜底;dual-write=false → 不双写旧表(默认关闭,no-op)
+dimension:
+  registry:
+    enabled: false
+    dual-write: false
+    retire-zero-call-days: 14
+
 ai:
 ai:
   prompts:
   prompts:
     questionnaire-version: "1"
     questionnaire-version: "1"