Sfoglia il codice sorgente

feat(energy.ledger.view): S-cfc-362 能量流水展示口径(sourceName/dimensionCode/ISO8601)使红转绿

- EnergyLog: 新增不入库展示字段 sourceName、dimensionCode;createdAt 增加 @JsonFormat(yyyy-MM-dd'T'HH:mm:ss)
- EnergyService.getLogs: 返回前补齐展示口径——sourceType→可读来源名(task→完成任务/health_checkin→健康打卡/assessment→测评,未映射回退原始码),dimensionId→dimensionCode
- 契约:SC-P-18 能量流水查看 / energy.ledger.view;EnergyLedgerViewContractTest 8/8 转绿
Sisyphus 6 giorni fa
parent
commit
e08d8af26

+ 11 - 0
cfc-backend/src/main/java/com/etotem/cfc/entity/EnergyLog.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -46,5 +47,15 @@ public class EnergyLog implements Serializable {
     /** 描述 */
     private String description;
 
+    /** 展示字段(不入库):来源可读名(SC-P-18 能量流水查看:task→完成任务 / health_checkin→健康打卡 / assessment→测评,未映射回退原始码) */
+    @TableField(exist = false)
+    private String sourceName;
+
+    /** 展示字段(不入库):维度代码(body/mind/wisdom/action/wealth,供前端按维度着色/筛选,无需再查维度表) */
+    @TableField(exist = false)
+    private String dimensionCode;
+
+    /** 创建时间(ISO 8601 序列化,与项目时间显示规范一致) */
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss")
     private Date createdAt;
 }

+ 38 - 1
cfc-backend/src/main/java/com/etotem/cfc/service/EnergyService.java

@@ -2005,7 +2005,44 @@ public class EnergyService {
         }
         wrapper.orderByDesc(EnergyLog::getCreatedAt);
         SortUtil.applySort(wrapper);
-        return energyLogMapper.selectPage(pageParam, wrapper);
+        Page<EnergyLog> result = energyLogMapper.selectPage(pageParam, wrapper);
+        enrichLogDisplay(result.getRecords());
+        return result;
+    }
+
+    /**
+     * 流水展示口径补齐(SC-P-18 能量流水查看 / 能力键 energy.ledger.view):
+     * 每条流水暴露可读来源名 {@code sourceName} 与维度代码 {@code dimensionCode},
+     * 使前端可直接展示来源、按维度着色/筛选,无需再查来源/维度表。
+     */
+    private void enrichLogDisplay(List<EnergyLog> logs) {
+        if (logs == null || logs.isEmpty()) {
+            return;
+        }
+        for (EnergyLog log : logs) {
+            log.setSourceName(resolveSourceName(log.getSourceType()));
+            if (log.getDimensionId() != null) {
+                EnergyDimension dim = getDimById(log.getDimensionId());
+                if (dim != null) {
+                    log.setDimensionCode(dim.getCode());
+                }
+            }
+        }
+    }
+
+    /**
+     * sourceType → 可读来源名映射;未映射来源回退原始码,不抛错。
+     */
+    private String resolveSourceName(String sourceType) {
+        if (sourceType == null) {
+            return null;
+        }
+        switch (sourceType) {
+            case "task": return "完成任务";
+            case "health_checkin": return "健康打卡";
+            case "assessment": return "测评";
+            default: return sourceType;
+        }
     }