ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

被检设备名称、厂家、软件版本、硬件版本调整

Browse Source
This commit is contained in:
caozehui
2025-01-13 15:00:34 +08:00
parent f971c3f2fa
commit db8205fbaa
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
device/src/main/java/com/njcn/gather/device/device/pojo/param/PqDevParam.java
View File

@@ -22,8 +22,8 @@ import java.util.List;
public class PqDevParam { public class PqDevParam {
@ApiModelProperty(value = "名称", required = true) @ApiModelProperty(value = "名称", required = true)
@NotBlank(message = DevValidMessage.NAME_NOT_BLANK) //@NotBlank(message = DevValidMessage.NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR) //@Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR)
private String name; private String name;
@ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）", required = true) @ApiModelProperty(value = "设备模式，字典表（数字、模拟、比对）", required = true)
@@ -50,8 +50,8 @@ public class PqDevParam {
private Float devCurr; private Float devCurr;
@ApiModelProperty(value = "设备厂家，字典表", required = true) @ApiModelProperty(value = "设备厂家，字典表", required = true)
@NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK) //@NotBlank(message = DevValidMessage.MANUFACTURER_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.MANUFACTURER_FORMAT_ERROR) //@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.MANUFACTURER_FORMAT_ERROR)
private String manufacturer; private String manufacturer;
@ApiModelProperty(value = "出厂日期", required = true) @ApiModelProperty(value = "出厂日期", required = true)
@@ -64,11 +64,11 @@ public class PqDevParam {
private String createId; private String createId;
@ApiModelProperty(value = "固件版本", required = true) @ApiModelProperty(value = "固件版本", required = true)
@NotBlank(message = DevValidMessage.FIRMWARE_NOT_BLANK) //@NotBlank(message = DevValidMessage.FIRMWARE_NOT_BLANK)
private String hardwareVersion; private String hardwareVersion;
@ApiModelProperty(value = "软件版本", required = true) @ApiModelProperty(value = "软件版本", required = true)
@NotBlank(message = DevValidMessage.SOFTWARE_NOT_BLANK) //@NotBlank(message = DevValidMessage.SOFTWARE_NOT_BLANK)
private String softwareVersion; private String softwareVersion;
@ApiModelProperty(value = "通讯协议", required = true) @ApiModelProperty(value = "通讯协议", required = true)