From 5a18d863778ffabcc45da185f7f77e7462289bb9 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期四, 27 八月 2026 20:45:31 +0800
Subject: [PATCH] feat(test): implement test configuration and channel binding
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TTest.java | 77 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 25 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTest.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTest.java
index 50d9870..0e27006 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTest.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTest.java
@@ -2,18 +2,16 @@
import java.util.Date;
import java.util.List;
+import com.alibaba.fastjson2.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import com.ruoyi.common.core.domain.BaseEntity;
-/**
- * 测试任务对象 t_test。
- *
- * @author ruoyi
- */
+/** 测试配置及其独立业务状态。 */
public class TTest extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -22,6 +20,10 @@
@NotBlank(message = "测试名称不能为空")
@Size(max = 100, message = "测试名称长度不能超过100个字符")
private String testName;
+ private Long creatorId;
+ private String creatorName;
+ @JSONField(serialize = false)
+ private transient Long operatorId;
@NotNull(message = "测试负责人不能为空")
private Long principalId;
private String principalName;
@@ -30,7 +32,11 @@
private String testTypeName;
@NotBlank(message = "测试目的不能为空")
private String testPurpose;
- private String status;
+ private String testStatus;
+ private String monitoringStatus;
+ private Integer monitorTimeoutMinutes;
+ private Date startedAtUtc;
+ private Date endedAtUtc;
private String delFlag;
private String batteryNo;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -38,42 +44,63 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date endCreateTime;
private Integer batteryCount;
- @NotEmpty(message = "测试电池关系不能为空")
+ @Valid
+ @NotEmpty(message = "测试至少绑定一个电池号")
private List<TTestBattery> batteries;
- @NotEmpty(message = "预警阈值不能为空")
+ @Valid
+ @NotEmpty(message = "计划工步不能为空")
+ private List<TTestPlanStep> planSteps;
+ @Valid
+ @NotEmpty(message = "阈值配置不能为空")
private List<TTestWarningThreshold> thresholds;
private List<TTestResult> resultSummary;
public Long getTestId() { return testId; }
- public void setTestId(Long testId) { this.testId = testId; }
+ public void setTestId(Long value) { testId = value; }
public String getTestName() { return testName; }
- public void setTestName(String testName) { this.testName = testName; }
+ public void setTestName(String value) { testName = value; }
+ public Long getCreatorId() { return creatorId; }
+ public void setCreatorId(Long value) { creatorId = value; }
+ public String getCreatorName() { return creatorName; }
+ public void setCreatorName(String value) { creatorName = value; }
+ public Long getOperatorId() { return operatorId; }
+ public void setOperatorId(Long value) { operatorId = value; }
public Long getPrincipalId() { return principalId; }
- public void setPrincipalId(Long principalId) { this.principalId = principalId; }
+ public void setPrincipalId(Long value) { principalId = value; }
public String getPrincipalName() { return principalName; }
- public void setPrincipalName(String principalName) { this.principalName = principalName; }
+ public void setPrincipalName(String value) { principalName = value; }
public Long getTestTypeId() { return testTypeId; }
- public void setTestTypeId(Long testTypeId) { this.testTypeId = testTypeId; }
+ public void setTestTypeId(Long value) { testTypeId = value; }
public String getTestTypeName() { return testTypeName; }
- public void setTestTypeName(String testTypeName) { this.testTypeName = testTypeName; }
+ public void setTestTypeName(String value) { testTypeName = value; }
public String getTestPurpose() { return testPurpose; }
- public void setTestPurpose(String testPurpose) { this.testPurpose = testPurpose; }
- public String getStatus() { return status; }
- public void setStatus(String status) { this.status = status; }
+ public void setTestPurpose(String value) { testPurpose = value; }
+ public String getTestStatus() { return testStatus; }
+ public void setTestStatus(String value) { testStatus = value; }
+ public String getMonitoringStatus() { return monitoringStatus; }
+ public void setMonitoringStatus(String value) { monitoringStatus = value; }
+ public Integer getMonitorTimeoutMinutes() { return monitorTimeoutMinutes; }
+ public void setMonitorTimeoutMinutes(Integer value) { monitorTimeoutMinutes = value; }
+ public Date getStartedAtUtc() { return startedAtUtc; }
+ public void setStartedAtUtc(Date value) { startedAtUtc = value; }
+ public Date getEndedAtUtc() { return endedAtUtc; }
+ public void setEndedAtUtc(Date value) { endedAtUtc = value; }
public String getDelFlag() { return delFlag; }
- public void setDelFlag(String delFlag) { this.delFlag = delFlag; }
+ public void setDelFlag(String value) { delFlag = value; }
public String getBatteryNo() { return batteryNo; }
- public void setBatteryNo(String batteryNo) { this.batteryNo = batteryNo; }
+ public void setBatteryNo(String value) { batteryNo = value; }
public Date getBeginCreateTime() { return beginCreateTime; }
- public void setBeginCreateTime(Date beginCreateTime) { this.beginCreateTime = beginCreateTime; }
+ public void setBeginCreateTime(Date value) { beginCreateTime = value; }
public Date getEndCreateTime() { return endCreateTime; }
- public void setEndCreateTime(Date endCreateTime) { this.endCreateTime = endCreateTime; }
+ public void setEndCreateTime(Date value) { endCreateTime = value; }
public Integer getBatteryCount() { return batteryCount; }
- public void setBatteryCount(Integer batteryCount) { this.batteryCount = batteryCount; }
+ public void setBatteryCount(Integer value) { batteryCount = value; }
public List<TTestBattery> getBatteries() { return batteries; }
- public void setBatteries(List<TTestBattery> batteries) { this.batteries = batteries; }
+ public void setBatteries(List<TTestBattery> value) { batteries = value; }
+ public List<TTestPlanStep> getPlanSteps() { return planSteps; }
+ public void setPlanSteps(List<TTestPlanStep> value) { planSteps = value; }
public List<TTestWarningThreshold> getThresholds() { return thresholds; }
- public void setThresholds(List<TTestWarningThreshold> thresholds) { this.thresholds = thresholds; }
+ public void setThresholds(List<TTestWarningThreshold> value) { thresholds = value; }
public List<TTestResult> getResultSummary() { return resultSummary; }
- public void setResultSummary(List<TTestResult> resultSummary) { this.resultSummary = resultSummary; }
+ public void setResultSummary(List<TTestResult> value) { resultSummary = value; }
}
--
Gitblit v1.7.1