From 091c09f4ef03d458209bce878451e0a7e667529b Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期日, 06 九月 2026 00:26:28 +0800
Subject: [PATCH] 拒绝与已有扩展测量不同的导入批次
---
battery-business/src/main/java/com/battery/business/service/impl/TestConsoleDataServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/battery-business/src/main/java/com/battery/business/service/impl/TestConsoleDataServiceImpl.java b/battery-business/src/main/java/com/battery/business/service/impl/TestConsoleDataServiceImpl.java
index f57eb5f..07c13c3 100644
--- a/battery-business/src/main/java/com/battery/business/service/impl/TestConsoleDataServiceImpl.java
+++ b/battery-business/src/main/java/com/battery/business/service/impl/TestConsoleDataServiceImpl.java
@@ -370,7 +370,9 @@
{
Map<String, Object> expected = JSON.parseObject(String.valueOf(left));
Map<String, Object> actual = right == null ? Map.of() : JSON.parseObject(right.toString());
- for (String field : expected.keySet()) if (!sameValue(expected.get(field), actual.get(field))) return false;
+ // 已有额外非空测量也属于内容差异；缺失与空值仍等价。
+ Set<String> fields = new HashSet<>(expected.keySet()); fields.addAll(actual.keySet());
+ for (String field : fields) if (!sameValue(expected.get(field), actual.get(field))) return false;
}
else if (!sameValue(left, right)) return false;
}
--
Gitblit v1.7.1