Procházet zdrojové kódy

fix(T05): 体脂秤 G4 细节完善(迁移424 幂等+防孤儿、measuredAt 归日、affectedRows、可选 imagePath)

- DatabaseInitializer 迁移424:改用 report_date IS NULL 判定未迁移行(幂等),
  去除 EXISTS 限制使孤儿成员也能迁移,family_id 允许为 NULL
- BodyFatScaleService:measuredAt 归一化为 java.sql.Date 以匹配 DATE 列,
  返回 affectedRows 替代 updated,移除无实质判定的 setStatus(normal)
- AdminBodyFatScaleController /save:新增可选 imagePath/measuredAt 参数,
  支持同一次测量的幂等重复提交(复用 recordId,走 upsert 覆盖)
- 单测同步 affectedRows 断言
Sisyphus před 3 týdny
rodič
revize
714e177470

+ 28 - 15
cfc-backend/src/main/java/com/etotem/cfc/config/DatabaseInitializer.java

@@ -14145,28 +14145,36 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
      * 迁移424: 存量 body_fat_scale 观测行 source_id 由旧语义 "memberId" 改写为 "recordId",
      * 使时间轴能展示多期测量(body_fat_scale 第二次起整批报错的根因修复附带的数据迁移)。
      *
+     * 幂等口径:旧版 BodyFatScaleService 写入时只填 sourceType/sourceId/definitionId/value/
+     * numericValue/recordedAt,report_date 恒为 NULL;本迁移只处理 report_date IS NULL 的存量行,
+     * 回填后写入 report_date + date_source='unknown',再次执行时无命中行 → 直接跳过。
+     *
      * 策略:
-     *   1. 按 memberId 分组,每组成员保留一条 record(measured_at = 最早 recorded_at),用于
-     *      后续源行改写。
-     *   2. 将所有存量 body_fat_scale 行的 source_id 更新为对应 record.id,并补写
-     *      report_date(= DATE(MIN(recorded_at)))与 date_source='unknown',避免存量数据
-     *      在时间轴过滤中被漏掉。
-     *   3. 幂等:再次执行时无存量行,直接跳过。
+     *   1. 按 memberId 分组,每组成员保留一条 record(measured_at = 最早 recorded_at)。
+     *   2. 将存量 body_fat_scale 行的 source_id 更新为对应 record.id,并补写
+     *      report_date(= DATE(MIN(recorded_at)))与 date_source='unknown',
+     *      避免存量数据在时间轴过滤(report_date IS NOT NULL)中被漏掉。
      */
     void migrateBodyFatScaleSourceIds() {
         try {
-            // 获取所有有 body_fat_scale 观测的成员及最早观测时间
+            // 存量候选:report_date IS NULL(未迁移)。旧语义 source_id = memberId,
+            // 成员可能已被删除,故不要求 family_members 中必须存在该 id(family_id 允许为空)。
             List<Map<String, Object>> memberRows = jdbcTemplate.queryForList(
-                    "SELECT source_id AS mid, MIN(DATE(recorded_at)) AS earliest FROM indicator_values "
-                            + "WHERE source_type = 'body_fat_scale' "
-                            + "GROUP BY source_id");
+                    "SELECT iv.source_id AS mid, MIN(DATE(iv.recorded_at)) AS earliest "
+                            + "FROM indicator_values iv "
+                            + "WHERE iv.source_type = 'body_fat_scale' AND iv.report_date IS NULL "
+                            + "GROUP BY iv.source_id");
             if (memberRows == null || memberRows.isEmpty()) {
-                log.info("迁移424: 无存量 body_fat_scale 观测,跳过 sourceId 回填");
+                log.info("迁移424: 无待回填的存量 body_fat_scale 观测,跳过 sourceId 回填");
                 return;
             }
-            Integer baseIdObj = jdbcTemplate.queryForObject(
+            // record id 必须避开 family_members.id 空间:否则回填后的 source_id 可能与
+            // 另一个尚未迁移的成员的 memberId 相同,UPDATE 时会撞 uk_source_definition。
+            Integer recMax = jdbcTemplate.queryForObject(
                     "SELECT COALESCE(MAX(id), 0) FROM body_fat_scale_records", Integer.class);
-            int seq = (baseIdObj != null) ? baseIdObj : 0;
+            Integer memMax = jdbcTemplate.queryForObject(
+                    "SELECT COALESCE(MAX(id), 0) FROM family_members", Integer.class);
+            int seq = Math.max(recMax != null ? recMax : 0, memMax != null ? memMax : 0);
 
             for (Map<String, Object> row : memberRows) {
                 Long memberId = ((Number) row.get("mid")).longValue();
@@ -14181,18 +14189,22 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
                 jdbcTemplate.execute(
                         "DELETE FROM indicator_values "
                                 + "WHERE source_type = 'body_fat_scale' AND source_id = " + memberId
+                                + " AND report_date IS NULL "
                                 + " AND id NOT IN ("
                                 + "  SELECT id FROM ("
                                 + "    SELECT MAX(id) AS id FROM indicator_values"
                                 + "    WHERE source_type = 'body_fat_scale' AND source_id = " + memberId
+                                + "    AND report_date IS NULL "
                                 + "    GROUP BY definition_id"
                                 + "  ) t"
                                 + ")");
 
                 // 2. 创建一条 record,ID 显式指定为 seq 避免 AUTO_INCREMENT 与存量 memberIds 碰撞
                 seq++;
-                Long familyId = jdbcTemplate.queryForObject(
+                // family_id 为空时也能迁移(member 已被删除的场景),familyIdSql 为 NULL
+                List<Long> famRows = jdbcTemplate.queryForList(
                         "SELECT family_id FROM family_members WHERE id = ?", Long.class, memberId);
+                Long familyId = famRows.isEmpty() ? null : famRows.get(0);
                 String familyIdSql = (familyId == null) ? "NULL" : String.valueOf(familyId);
                 jdbcTemplate.execute(
                         "INSERT INTO body_fat_scale_records (id, member_id, family_id, image_url, measured_at)"
@@ -14205,7 +14217,8 @@ log.info("迁移298: 已为无 openid 的 child 账号补齐 family_members 记
                         "UPDATE indicator_values SET source_id = " + recordId
                                 + ", report_date = '" + earliest + "'"
                                 + ", date_source = 'unknown'"
-                                + " WHERE source_type = 'body_fat_scale' AND source_id = " + memberId);
+                                + " WHERE source_type = 'body_fat_scale' AND source_id = " + memberId
+                                + " AND report_date IS NULL");
             }
             log.info("迁移424: 存量体脂秤 sourceId 回填完成,共处理 {} 个成员", memberRows.size());
         } catch (Exception e) {

+ 31 - 1
cfc-backend/src/main/java/com/etotem/cfc/controller/admin/AdminBodyFatScaleController.java

@@ -7,6 +7,9 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -47,7 +50,34 @@ public class AdminBodyFatScaleController {
         if (metrics == null || metrics.isEmpty()) {
             return Result.error("metrics 不能为空");
         }
-        return Result.success(bodyFatScaleService.saveMetrics(memberId, metrics));
+        // 可选:imagePath / measuredAt,用于把这次保存绑定到一条体脂秤测量记录
+        // (重复提交同一次测量时命中同一条记录,走 upsert 覆盖,不产生重复测量点)
+        String imagePath = params.get("imagePath") != null
+                ? params.get("imagePath").toString().trim() : null;
+        Date measuredAt = parseMeasuredAt(params.get("measuredAt"));
+        return Result.success(bodyFatScaleService.saveMetrics(memberId, metrics, imagePath, measuredAt));
+    }
+
+    /**
+     * 解析测量日期,支持 yyyy-MM-dd 与 yyyy-MM-dd HH:mm:ss;解析失败返回 null(按上传日记录)。
+     */
+    private Date parseMeasuredAt(Object raw) {
+        if (raw == null) {
+            return null;
+        }
+        String text = raw.toString().trim();
+        if (text.isEmpty()) {
+            return null;
+        }
+        String[] patterns = {"yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss"};
+        for (String pattern : patterns) {
+            try {
+                return new SimpleDateFormat(pattern).parse(text);
+            } catch (ParseException ignore) {
+                // 试下一个格式
+            }
+        }
+        return null;
     }
 
     @Operation(summary = "批量处理多张图片并保存")

+ 21 - 18
cfc-backend/src/main/java/com/etotem/cfc/service/BodyFatScaleService.java

@@ -247,8 +247,10 @@ public class BodyFatScaleService {
     }
 
     /**
-     * 完整签名:允许显式传入 recordId(幂等复用已有测量记录)、imageUrl、measuredAt。
-     * recordId 为空时自动创建新记录(同日同图片则复用已有记录)。
+     * 完整签名:允许传入 imageUrl / measuredAt。
+     * - imageUrl 相同 → 复用已有测量记录(同一次测量重复提交走 upsert 覆盖,不新增测量点)
+     * - measuredAt 相同 → 复用当日已有记录
+     * - 都为空 → 视为一次新的测量,创建新 record(多期时序语义)
      */
     public Map<String, Object> saveMetrics(Long memberId, List<Map<String, Object>> metrics,
                                            String imageUrl, Date measuredAt) {
@@ -262,6 +264,9 @@ public class BodyFatScaleService {
         // 解析家庭ID
         Long familyId = resolveFamilyId(memberId);
 
+        // measured_at 为 DATE 列,统一按「日」归一化,避免带时分秒导致等值匹配落空
+        java.sql.Date measuredDay = (measuredAt != null) ? new java.sql.Date(measuredAt.getTime()) : null;
+
         // 找一条已有的同名测量记录(幂等复用):优先同图片URL,其次同测量日期
         Long reuseRecordId = null;
         if (imageUrl != null && !imageUrl.isEmpty()) {
@@ -275,11 +280,11 @@ public class BodyFatScaleService {
                 reuseRecordId = existingByImage.getId();
             }
         }
-        if (reuseRecordId == null && measuredAt != null) {
+        if (reuseRecordId == null && measuredDay != null) {
             BodyFatScaleRecord existingByDate = bodyFatScaleRecordMapper.selectOne(
                     new LambdaQueryWrapper<BodyFatScaleRecord>()
                             .eq(BodyFatScaleRecord::getMemberId, memberId)
-                            .eq(BodyFatScaleRecord::getMeasuredAt, measuredAt)
+                            .eq(BodyFatScaleRecord::getMeasuredAt, measuredDay)
                             .orderByDesc(BodyFatScaleRecord::getId)
                             .last("LIMIT 1"));
             if (existingByDate != null) {
@@ -296,21 +301,20 @@ public class BodyFatScaleService {
             record.setMemberId(memberId);
             record.setFamilyId(familyId);
             record.setImageUrl(imageUrl);
-            record.setMeasuredAt(measuredAt);
+            record.setMeasuredAt(measuredDay);
             bodyFatScaleRecordMapper.insert(record);
             recordId = record.getId();
             log.info("体脂秤测量记录已创建 recordId={}, memberId={}", recordId, memberId);
         }
 
-        // 取当前日期的 SQL DATE 作为 fallback report_date
+        // report_date:测量日优先,取不到则记上传日;date_source 区分 real / upload
         java.sql.Date fallbackDate = new java.sql.Date(new Date().getTime());
-        java.sql.Date reportDate = (measuredAt != null)
-                ? new java.sql.Date(measuredAt.getTime()) : fallbackDate;
-        String dateSource = (measuredAt != null) ? "real" : "upload";
+        java.sql.Date reportDate = (measuredDay != null) ? measuredDay : fallbackDate;
+        String dateSource = (measuredDay != null) ? "real" : "upload";
 
         AtomicInteger saved = new AtomicInteger(0);
         AtomicInteger skipped = new AtomicInteger(0);
-        AtomicInteger updated = new AtomicInteger(0);
+        AtomicInteger affected = new AtomicInteger(0);
 
         for (Map<String, Object> metric : metrics) {
             String name = metric.get("name") != null ? metric.get("name").toString().trim() : "";
@@ -347,12 +351,11 @@ public class BodyFatScaleService {
                 iv.setReportDate(reportDate);
                 iv.setDateSource(dateSource);
                 iv.setRefRangeSnapshot(def.getRefRange());
-                iv.setStatus("normal");
+                // status 为「观测状态快照(正常/偏高/偏低)」,体脂秤原始读数不做区间判定,保持为空不臆造
 
                 int rows = indicatorValueMapper.upsertMapping(iv);
-                if (rows > 0) {
-                    updated.incrementAndGet();
-                }
+                // MySQL ON DUPLICATE KEY UPDATE:插入返回 1,更新返回 2,值未变返回 0
+                affected.addAndGet(Math.max(rows, 0));
                 saved.incrementAndGet();
             } catch (Exception e) {
                 // 单条指标失败不阻断整批(避免旧 insert 时的 DuplicateKeyException 炸整批)
@@ -365,7 +368,7 @@ public class BodyFatScaleService {
         Map<String, Object> result = new LinkedHashMap<>();
         result.put("saved", saved.get());
         result.put("skipped", skipped.get());
-        result.put("updated", updated.get());
+        result.put("affectedRows", affected.get());
         result.put("memberId", memberId);
         result.put("recordId", recordId);
         return result;
@@ -434,7 +437,7 @@ public class BodyFatScaleService {
         Map<String, Object> summary = new LinkedHashMap<>();
         List<Map<String, Object>> allResults = new ArrayList<>();
         AtomicInteger totalSaved = new AtomicInteger(0);
-        AtomicInteger totalUpdated = new AtomicInteger(0);
+        AtomicInteger totalAffected = new AtomicInteger(0);
         AtomicInteger totalSkipped = new AtomicInteger(0);
 
         for (String path : imagePaths) {
@@ -444,7 +447,7 @@ public class BodyFatScaleService {
                 Map<String, Object> saved = saveMetrics(memberId, metrics, path, null);
                 imgResult.put("saved", saved);
                 totalSaved.addAndGet((int) saved.getOrDefault("saved", 0));
-                totalUpdated.addAndGet((int) saved.getOrDefault("updated", 0));
+                totalAffected.addAndGet((int) saved.getOrDefault("affectedRows", 0));
                 totalSkipped.addAndGet((int) saved.getOrDefault("skipped", 0));
             }
             allResults.add(imgResult);
@@ -452,7 +455,7 @@ public class BodyFatScaleService {
 
         summary.put("totalImages", imagePaths.size());
         summary.put("totalSaved", totalSaved.get());
-        summary.put("totalUpdated", totalUpdated.get());
+        summary.put("totalAffectedRows", totalAffected.get());
         summary.put("totalSkipped", totalSkipped.get());
         summary.put("results", allResults);
         return summary;

+ 1 - 1
cfc-backend/src/test/java/com/etotem/cfc/service/BodyFatScaleServiceTest.java

@@ -156,7 +156,7 @@ class BodyFatScaleServiceTest {
 
         Map<String, Object> result = service.saveMetrics(100L, metrics);
         assertEquals(1, result.get("skipped"), "单条异常指标应跳过");
-        assertEquals(1, result.get("updated"), "有效指标应写入");
+        assertEquals(1, result.get("affectedRows"), "有效指标应写入");
     }
 
     @Test