From 41dce73ba68e706bb876b3712a14cecb0269c962 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期一, 31 八月 2026 19:17:51 +0800
Subject: [PATCH] 删除偏移的全局结果查询接口
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java
index db97598..6818955 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java
@@ -20,7 +20,6 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.TTest;
import com.ruoyi.system.domain.TTestResult;
-import com.ruoyi.system.domain.TTestReceptionInterval;
import com.ruoyi.system.service.ITTestService;
/** 测试管理 Controller。 */
@@ -96,7 +95,7 @@
return success(testService.selectTestById(testId));
}
- /** 独立暂停接收动作；只关闭系统接收区间，不向设备发送控制命令。 */
+ /** 独立暂停接收动作；停止该测试数据请求，不向设备发送控制命令。 */
@PreAuthorize("@ss.hasPermi('system:test:pause')")
@Log(title = "测试数据接收", businessType = BusinessType.UPDATE)
@PostMapping("/{testId}/reception/pause")
@@ -106,7 +105,7 @@
return success(testService.selectTestById(testId));
}
- /** 独立继续接收动作；从新的成功观测边界打开区间，不向设备发送控制命令。 */
+ /** 独立继续接收动作；恢复该测试数据请求，不向设备发送控制命令。 */
@PreAuthorize("@ss.hasPermi('system:test:resume')")
@Log(title = "测试数据接收", businessType = BusinessType.UPDATE)
@PostMapping("/{testId}/reception/resume")
@@ -116,13 +115,24 @@
return success(testService.selectTestById(testId));
}
- /** 返回测试各来源的接收区间、动作时间和实际采样边界。 */
- @PreAuthorize("@ss.hasPermi('system:test:query')")
- @GetMapping("/{testId}/reception/intervals")
- public AjaxResult receptionIntervals(@PathVariable Long testId)
+ /** 独立停止测试动作；进入不可恢复终态且不向设备发送控制命令。 */
+ @PreAuthorize("@ss.hasPermi('system:test:stop')")
+ @Log(title = "停止测试", businessType = BusinessType.UPDATE)
+ @PostMapping("/{testId}/stop")
+ public AjaxResult stopTest(@PathVariable Long testId)
{
- List<TTestReceptionInterval> intervals = testService.selectReceptionIntervals(testId);
- return success(intervals);
+ testService.stopTest(testId, getUserId(), getUsername());
+ return success(testService.selectTestById(testId));
+ }
+
+ /** 人工结束接收动作别名；与停止测试共用原子关闭区间和释放租约事务。 */
+ @PreAuthorize("@ss.hasPermi('system:test:stop')")
+ @Log(title = "人工结束接收", businessType = BusinessType.UPDATE)
+ @PostMapping("/{testId}/reception/end")
+ public AjaxResult endReception(@PathVariable Long testId)
+ {
+ testService.stopTest(testId, getUserId(), getUsername());
+ return success(testService.selectTestById(testId));
}
@PreAuthorize("@ss.hasPermi('system:test:remove')")
@@ -141,4 +151,5 @@
startPage();
return getDataTable(testService.selectTestResults(result));
}
+
}
--
Gitblit v1.7.1