清理旧测试结构并贯通最终业务数据链路

yeg

2026-09-05 92f32acd847ea1700590bc669750f23ef499840e

 ruoyi-admin/src/main/java/com/battery/business/web/TTestController.java

File was renamed from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TTestController.java
@@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system;
package com.battery.business.web;

import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,22 +18,21 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.TTest;
import com.ruoyi.system.domain.TTestBattery;
import com.ruoyi.system.domain.TTestChannelBinding;
import com.ruoyi.system.domain.TTestCollectorChannel;
import com.ruoyi.system.domain.TTestWarningThreshold;
import com.battery.business.domain.TTest;
import com.battery.business.domain.TTestBattery;
import com.battery.business.domain.TTestChannelBinding;
import com.battery.business.domain.TTestCollectorChannel;
import com.battery.business.domain.TTestWarningThreshold;
import com.battery.business.test.dto.TestConfigurationDto;
import com.battery.business.test.dto.TestBatteryBindingDto;
import com.battery.business.test.dto.ThresholdDto;
import com.ruoyi.system.domain.TTestResult;
import com.ruoyi.system.domain.TTestLogicStepMapping;
import com.ruoyi.system.domain.TTestConsoleDetail;
import com.ruoyi.system.domain.TTestDataRevisionAction;
import com.ruoyi.system.domain.TTestDataOverride;
import com.ruoyi.system.service.ITTestService;
import com.ruoyi.system.service.ITestConsoleDataService;
import com.ruoyi.system.service.ITestDataQueryService;
import com.battery.business.domain.TTestLogicStepMapping;
import com.battery.business.domain.TTestConsoleDetail;
import com.battery.business.domain.TTestDataRevisionAction;
import com.battery.business.domain.DataRevisionItem;
import com.battery.business.service.ITTestService;
import com.battery.business.service.ITestConsoleDataService;
import com.battery.business.service.ITestDataQueryService;

/** 测试管理 Controller。 */
@RestController
@@ -176,14 +175,6 @@
        return success(testService.selectTestById(testId));
    }

    /** 返回当前测试某类数据的人工覆盖和删除状态，供刷新后恢复展示。 */
    @PreAuthorize("@ss.hasPermi('system:test:query')")
    @GetMapping("/{testId}/console-data/{dataType}/overrides")
    public AjaxResult dataOverrides(@PathVariable Long testId, @PathVariable String dataType)
    {
        return success(consoleDataService.selectOverrides(testId, dataType));
    }

    /** 查询当前测试成功接收的检测柜与采集器实时观测。 */
    @PreAuthorize("@ss.hasPermi('system:test:query')")
    @GetMapping("/{testId}/data/records")
@@ -221,30 +212,18 @@
        action.setChangesSummary(request.changesSummary()); action.setReason(request.reason());
        action.setOperatorId(getUserId()); action.setOperatorName(getUsername());
        Long actionId = consoleDataService.submitAction(action,
                request.overrides() == null ? java.util.Collections.emptyList() : request.overrides(),
                request.btsSampleIds(), request.collectorSampleIds());
                request.overrides() == null ? java.util.Collections.emptyList() : request.overrides());
        return success().put("actionId", actionId);
    }

    public record ConsoleDataActionRequest(String dataType, String operationType, String scopeSummary,
            String identitySummary, String changesSummary, String reason, List<TTestDataOverride> overrides,
            List<Long> btsSampleIds, List<Long> collectorSampleIds) { }
            String identitySummary, String changesSummary, String reason, List<DataRevisionItem> overrides) { }

    @PreAuthorize("@ss.hasPermi('system:test:remove')")
    @Log(title = "测试管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/{testIds}")
    public AjaxResult remove(@PathVariable Long[] testIds)
    {
        return toAjax(testService.deleteTestByIds(testIds, getUserId(), getUsername()));
    }

    @PreAuthorize("@ss.hasPermi('system:test:query')")
    @GetMapping("/{testId}/results")
    public TableDataInfo results(@PathVariable Long testId, TTestResult result)
    {
        result.setTestId(testId);
        startPage();
        return getDataTable(testService.selectTestResults(result));
    }

    /** 将测试配置 DTO 转换为现有测试服务模型；计划工步等废止字段不再进入服务。 */