From a2a8908f2d9d4e19201423ff58ee23c65a8df670 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 20:51:10 +0800
Subject: [PATCH] 实现测试原子开始接收
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 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 555b1f2..c1cd2e5 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
@@ -30,6 +30,13 @@
@Autowired
private ITTestService testService;
+ @PreAuthorize("@ss.hasAnyPermi('system:test:add,system:test:edit')")
+ @GetMapping("/options")
+ public AjaxResult options()
+ {
+ return success(testService.selectConfigurationOptions());
+ }
+
@PreAuthorize("@ss.hasPermi('system:test:list')")
@GetMapping("/list")
public TableDataInfo list(TTest test)
@@ -51,8 +58,11 @@
@PostMapping
public AjaxResult add(@Validated @RequestBody TTest test)
{
+ test.setOperatorId(getUserId());
+ test.setCreatorId(getUserId());
test.setCreateBy(getUsername());
- return toAjax(testService.insertTest(test));
+ Long testId = testService.createTest(test);
+ return success(testService.selectTestById(testId));
}
@PreAuthorize("@ss.hasPermi('system:test:edit')")
@@ -60,8 +70,10 @@
@PutMapping
public AjaxResult edit(@Validated @RequestBody TTest test)
{
+ test.setOperatorId(getUserId());
test.setUpdateBy(getUsername());
- return toAjax(testService.updateTest(test));
+ testService.updateTest(test);
+ return success(testService.selectTestById(test.getTestId()));
}
@PreAuthorize("@ss.hasPermi('system:test:start')")
@@ -69,7 +81,18 @@
@PutMapping("/start")
public AjaxResult start(@RequestParam Long testId)
{
- return toAjax(testService.startTest(testId, getUsername()));
+ testService.startReception(testId, getUserId(), getUsername());
+ return success(testService.selectTestById(testId));
+ }
+
+ /** 独立的开始接收动作；只改变系统数据归属，不向设备发送控制命令。 */
+ @PreAuthorize("@ss.hasPermi('system:test:start')")
+ @Log(title = "测试数据接收", businessType = BusinessType.UPDATE)
+ @PostMapping("/{testId}/reception/start")
+ public AjaxResult startReception(@PathVariable Long testId)
+ {
+ testService.startReception(testId, getUserId(), getUsername());
+ return success(testService.selectTestById(testId));
}
@PreAuthorize("@ss.hasPermi('system:test:remove')")
@@ -77,7 +100,7 @@
@DeleteMapping("/{testIds}")
public AjaxResult remove(@PathVariable Long[] testIds)
{
- return toAjax(testService.deleteTestByIds(testIds, getUsername()));
+ return toAjax(testService.deleteTestByIds(testIds, getUserId(), getUsername()));
}
@PreAuthorize("@ss.hasPermi('system:test:query')")
--
Gitblit v1.7.1