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/TTestBattery.java | 56 ++++++++++++++++++++------------------------------------
1 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTestBattery.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTestBattery.java
index fd3c2ab..02ed1a0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTestBattery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TTestBattery.java
@@ -2,12 +2,11 @@
import java.io.Serializable;
import java.util.List;
-import jakarta.validation.constraints.Min;
+import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
-/** 测试与电池号关系对象 t_test_battery。 */
+/** 测试内的电池号、可选采集器与主要检测柜通道配置。 */
public class TTestBattery implements Serializable
{
private static final long serialVersionUID = 1L;
@@ -16,50 +15,35 @@
private Long testId;
@NotNull(message = "电池组不能为空")
private Long groupId;
+ private String groupName;
@NotBlank(message = "电池号不能为空")
private String batteryNo;
- @NotNull(message = "检测柜不能为空")
- private Long cabinetId;
- @NotNull(message = "测试通道不能为空")
- @Min(value = 0, message = "测试通道不能小于0")
- private Integer testChannelNo;
- @NotNull(message = "采集器不能为空")
private Long collectorId;
- @NotNull(message = "温度通道不能为空")
- @Min(value = 0, message = "温度通道不能小于0")
- private Integer temperatureChannelNo;
- @NotNull(message = "正电位通道不能为空")
- @Min(value = 0, message = "正电位通道不能小于0")
- private Integer positiveChannelNo;
- @NotNull(message = "负电位通道不能为空")
- @Min(value = 0, message = "负电位通道不能小于0")
- private Integer negativeChannelNo;
+ private String collectorName;
private String delFlag;
- @NotEmpty(message = "扩展属性不能为空")
+ @Valid
+ @NotNull(message = "主要检测柜通道不能为空")
+ private TTestChannelBinding binding;
private List<TTestBatteryField> fields;
public Long getRelationId() { return relationId; }
- public void setRelationId(Long relationId) { this.relationId = relationId; }
+ public void setRelationId(Long value) { relationId = value; }
public Long getTestId() { return testId; }
- public void setTestId(Long testId) { this.testId = testId; }
+ public void setTestId(Long value) { testId = value; }
public Long getGroupId() { return groupId; }
- public void setGroupId(Long groupId) { this.groupId = groupId; }
+ public void setGroupId(Long value) { groupId = value; }
+ public String getGroupName() { return groupName; }
+ public void setGroupName(String value) { groupName = value; }
public String getBatteryNo() { return batteryNo; }
- public void setBatteryNo(String batteryNo) { this.batteryNo = batteryNo; }
- public Long getCabinetId() { return cabinetId; }
- public void setCabinetId(Long cabinetId) { this.cabinetId = cabinetId; }
- public Integer getTestChannelNo() { return testChannelNo; }
- public void setTestChannelNo(Integer testChannelNo) { this.testChannelNo = testChannelNo; }
+ public void setBatteryNo(String value) { batteryNo = value; }
public Long getCollectorId() { return collectorId; }
- public void setCollectorId(Long collectorId) { this.collectorId = collectorId; }
- public Integer getTemperatureChannelNo() { return temperatureChannelNo; }
- public void setTemperatureChannelNo(Integer temperatureChannelNo) { this.temperatureChannelNo = temperatureChannelNo; }
- public Integer getPositiveChannelNo() { return positiveChannelNo; }
- public void setPositiveChannelNo(Integer positiveChannelNo) { this.positiveChannelNo = positiveChannelNo; }
- public Integer getNegativeChannelNo() { return negativeChannelNo; }
- public void setNegativeChannelNo(Integer negativeChannelNo) { this.negativeChannelNo = negativeChannelNo; }
+ public void setCollectorId(Long value) { collectorId = value; }
+ public String getCollectorName() { return collectorName; }
+ public void setCollectorName(String value) { collectorName = value; }
public String getDelFlag() { return delFlag; }
- public void setDelFlag(String delFlag) { this.delFlag = delFlag; }
+ public void setDelFlag(String value) { delFlag = value; }
+ public TTestChannelBinding getBinding() { return binding; }
+ public void setBinding(TTestChannelBinding value) { binding = value; }
public List<TTestBatteryField> getFields() { return fields; }
- public void setFields(List<TTestBatteryField> fields) { this.fields = fields; }
+ public void setFields(List<TTestBatteryField> value) { fields = value; }
}
--
Gitblit v1.7.1