From 890049eeece6fc94cd974368451cdc36ec89fdf4 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 22:28:38 +0800
Subject: [PATCH] 兼容甲方三类数据单页导入并保留同秒记录
---
ruoyi-admin/src/test/java/com/battery/business/service/impl/TestConsoleDataRevisionQueryServiceTest.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestConsoleDataRevisionQueryServiceTest.java b/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestConsoleDataRevisionQueryServiceTest.java
index 51b235b..49098e6 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestConsoleDataRevisionQueryServiceTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/service/impl/TestConsoleDataRevisionQueryServiceTest.java
@@ -85,14 +85,14 @@
{
var action = action("IMPORT", "manual-1");
mapper.selectTestByIdForUpdate(1L).setTestStatus("COMPLETED");
- when(mapper.selectImportBinding(1L, "BAT-1")).thenReturn(Map.of("test_battery_id", 4L, "binding_id", 5L, "adapter_code", "adapter-a"));
- action.setChangesSummary("[{\"recordNo\":\"manual-1\",\"batteryNo\":\"BAT-1\",\"recordedAt\":1770000000123,\"sequenceId\":17,\"voltage\":3.6}]");
+ when(mapper.selectImportBinding(1L, "BAT-1")).thenReturn(Map.of("test_battery_id", 4L, "binding_id", 5L, "adapter_code", "adapter-a", "devtype", 27, "devid", 1, "subdevid", 1, "chlid", 1));
+ action.setChangesSummary("[{\"recordNo\":\"manual-1\",\"batteryNo\":\"BAT-1\",\"recordedAt\":1770000000123,\"cycleNo\":1,\"stepNo\":1,\"stepName\":\"恒流充电\",\"sequenceId\":17,\"voltage\":3.6}]");
service.submitAction(action, List.of());
var values = org.mockito.ArgumentCaptor.forClass(Map.class);
verify(mapper).insertImportedDataRecord(eq("REALTIME"), values.capture());
assertEquals("manual-1", values.getValue().get("source_record_id"));
- assertEquals(17, values.getValue().get("cabinet_sequence_id"));
- assertEquals("IMPORT", values.getValue().get("source_identity"));
+ assertEquals(17L, values.getValue().get("cabinet_sequence_id"));
+ assertEquals("adapter-a:27:1:1:1", values.getValue().get("source_identity"));
}
private TTestDataRevisionAction action(String operation, String identity)
--
Gitblit v1.7.1