From 2e75fb72c1ba5d3d055362b44e7b85c0ad3f5416 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 05 九月 2026 18:41:47 +0800
Subject: [PATCH] 按设备绑定关系查询关联测试与通道
---
ruoyi-admin/src/test/java/com/battery/business/service/impl/TDetectionCabinetServiceImplTest.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/battery/business/service/impl/TDetectionCabinetServiceImplTest.java b/ruoyi-admin/src/test/java/com/battery/business/service/impl/TDetectionCabinetServiceImplTest.java
index 6a464b1..209a3dc 100644
--- a/ruoyi-admin/src/test/java/com/battery/business/service/impl/TDetectionCabinetServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/battery/business/service/impl/TDetectionCabinetServiceImplTest.java
@@ -94,7 +94,7 @@
assertEquals(new BigDecimal("120.50"), savedCabinet.getCapacity());
assertEquals("OFFLINE", savedCabinet.getOnlineStatus());
assertEquals("0", savedCabinet.getStatus());
- assertNull(savedCabinet.getCurrentTest());
+ assertTrue(savedCabinet.getRelatedTests().isEmpty());
}
/**
@@ -134,10 +134,10 @@
}
/**
- * 验证检测柜主列表从通道事实派生旧页面展示字段，不读取数据库不存在的列。
+ * 验证检测柜主列表保留操作校验所需派生状态，不读取数据库不存在的列。
*/
@Test
- void detectionCabinetListSqlShouldDeriveLegacyPresentationFields() throws IOException
+ void detectionCabinetListSqlShouldDeriveOperationStateWithoutCurrentTest() throws IOException
{
try (InputStream input = getClass().getResourceAsStream(
"/mapper/battery/TDetectionCabinetMapper.xml"))
@@ -150,7 +150,7 @@
assertFalse(selectSql.contains("online_status, test_status"));
assertFalse(selectSql.contains("current_test, status"));
assertTrue(selectSql.contains("as test_status"));
- assertTrue(selectSql.contains("as current_test"));
+ assertFalse(selectSql.contains("current_test"));
String activeTestSql = sqlFragment(mapperXml, "activeCabinetTestExists");
assertTrue(activeTestSql.contains("t_test_channel_binding"));
assertTrue(activeTestSql.contains("t_detection_channel"));
@@ -206,7 +206,7 @@
}
/**
- * 验证设备选择列表读取 Redis 候选，并保持原前端字段和状态文本。
+ * 验证设备选择列表读取候选的设备事实，不推断系统测试关系。
*/
@Test
void selectDiscoveredCabinetListShouldMapPersistedCabinetFacts()
@@ -220,8 +220,9 @@
assertEquals("192.168.1.10", devices.get(0).getIp());
assertEquals("AA:BB:CC:DD:EE:FF", devices.get(0).getMac());
assertEquals("在线", devices.get(0).getOnlineStatus());
- assertEquals("测试中", devices.get(0).getTestStatus());
- assertEquals("待确认", devices.get(0).getCurrentTest());
+ var fields = new com.fasterxml.jackson.databind.ObjectMapper().valueToTree(devices.get(0));
+ assertFalse(fields.has("testStatus"));
+ assertFalse(fields.has("currentTest"));
assertEquals("一号模拟柜", devices.get(0).getName());
assertEquals("开发模拟器", devices.get(0).getManufacturer());
assertEquals("BTS Virtual Cabinet", devices.get(0).getModel());
--
Gitblit v1.7.1