|
|
@@ -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;
|