From 5db584fd6c3ccf88a6613bd2f104c7c559aa64d3 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期日, 30 八月 2026 23:46:36 +0800
Subject: [PATCH] 修复继续接收加载测试配置
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestServiceImpl.java | 2 ++
ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java | 3 +++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java
index 0dd6a09..2198c3a 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TTestServiceImplTest.java
@@ -524,7 +524,10 @@
TTest current = validTest();
current.setTestId(10L);
current.setReceptionStatus("PAUSED");
+ List<TTestBattery> configuredBatteries = current.getBatteries();
+ current.setBatteries(null);
when(testMapper.selectTestByIdForUpdate(10L)).thenReturn(current);
+ when(testMapper.selectTestBatteries(10L)).thenReturn(configuredBatteries);
when(testMapper.updateReceptionResumed(eq(10L), eq("operator"), any())).thenReturn(1);
assertEquals(1, testService.resumeReception(10L, 7L, "operator"));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestServiceImpl.java
index c2dac75..046b8c3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTestServiceImpl.java
@@ -253,6 +253,8 @@
if (current == null) throw new ServiceException("测试不存在");
if (!"PAUSED".equals(current.getReceptionStatus()))
throw new ServiceException("当前测试不是暂停接收状态");
+ // 加锁查询只返回测试主表，继续接收需要完整绑定配置来重建各来源接收区间。
+ loadConfiguration(current);
Date actionAt = new Date();
if (testMapper.updateReceptionResumed(testId, updateBy, actionAt) != 1)
throw new ServiceException("测试状态已变更，请刷新后重试");
--
Gitblit v1.7.1