From 091c09f4ef03d458209bce878451e0a7e667529b Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期日, 06 九月 2026 00:26:28 +0800
Subject: [PATCH] 拒绝与已有扩展测量不同的导入批次
---
ruoyi-admin/src/test/java/com/battery/business/web/ConsoleSingleSheetImportDatabaseTest.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/battery/business/web/ConsoleSingleSheetImportDatabaseTest.java b/ruoyi-admin/src/test/java/com/battery/business/web/ConsoleSingleSheetImportDatabaseTest.java
index d2b0686..a82596b 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/web/ConsoleSingleSheetImportDatabaseTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/web/ConsoleSingleSheetImportDatabaseTest.java
@@ -196,6 +196,17 @@
assertWorkbookEmpty();
}
+ @Test void workbookRejectsExistingExtraStepMeasurementInsteadOfSkippingIt()
+ {
+ submit("STEP", List.of(row()));
+ jdbc.update("update t_test_step_record set extension_measurements_json=?", "{\"stepDuration\":3752,\"auxTemperature\":99}");
+ var sheets = Map.of("REALTIME", List.of(row()), "STEP", List.of(row()), "CYCLE", List.of(row()));
+ assertTrue(assertThrows(RuntimeException.class, () -> submitWorkbook(sheets)).getMessage().contains("冲突拒绝"));
+ assertTrue(mapper.selectImportDataRecords(1L, "REALTIME").isEmpty());
+ assertTrue(mapper.selectImportDataRecords(1L, "CYCLE").isEmpty());
+ assertEquals(1, service.selectActions(new TTestDataRevisionAction()).size());
+ }
+
private void assertWorkbookEmpty()
{
for (String type : List.of("REALTIME", "STEP", "CYCLE")) assertTrue(mapper.selectImportDataRecords(1L, type).isEmpty());
--
Gitblit v1.7.1