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
2024-12-23 14:42:27 +08:00
parent 8f0b923744
commit 5f694c88bf
4 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
device/src/main/java/com/njcn/gather/device/err/pojo/param/PqErrSysDtlsParam.java
View File

@@ -22,19 +22,15 @@ public class PqErrSysDtlsParam {
private String type;
@ApiModelProperty(value = "误差判断起始值", required = true)
@NotNull(message = DevValidMessage.START_VALUE_NOT_NULL)
private Float startValue;
@ApiModelProperty(value = "是否包含起始值", required = true)
@NotNull(message = DevValidMessage.START_FLAG_NOT_NULL)
private Integer startFlag;
@ApiModelProperty(value = "误差判断结束值", required = true)
@NotNull(message = DevValidMessage.END_VALUE_NOT_NULL)
private Float endValue;
@ApiModelProperty(value = "是否包含结束值", required = true)
@NotNull(message = DevValidMessage.END_FLAG_NOT_NULL)
private Integer endFlag;
// @ApiModelProperty(value = "单位", required = true)
@@ -43,17 +39,14 @@ public class PqErrSysDtlsParam {
// private String unit;
@ApiModelProperty(value = "判断条件值类型", required = true)
@NotBlank(message = DevValidMessage.CONDITION_TYPE_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ERROR_VALUE_FORMAT_ERROR)
private String conditionType;
private Integer conditionType;
@ApiModelProperty(value = "最大值误差", required = true)
@NotNull(message = DevValidMessage.MAX_ERROR_VALUE_NOT_NULL)
private Float maxErrorValue;
@ApiModelProperty(value = "误差值类型", required = true)
@NotBlank(message = DevValidMessage.ERROR_VALUE_TYPE_NOT_BLANK)
@Pattern(regexp = PatternRegex.SYSTEM_ID, message = DevValidMessage.ERROR_VALUE_FORMAT_ERROR)
private String errorValueType;
@NotNull(message = DevValidMessage.ERROR_VALUE_TYPE_NOT_BLANK)
private Integer errorValueType;
}

4
device/src/main/java/com/njcn/gather/device/err/pojo/po/PqErrSysDtls.java
View File

@@ -56,7 +56,7 @@ public class PqErrSysDtls implements Serializable {
/**
* 判断条件值类型（包括值类型，绝对值、相对值）
*/
private String conditionType;
private Integer conditionType;
/**
* 误差最大值
@@ -66,7 +66,7 @@ public class PqErrSysDtls implements Serializable {
/**
* 误差值类型
*/
private String errorValueType;
private Integer errorValueType;
}

2
device/src/main/java/com/njcn/gather/device/pojo/constant/DevValidMessage.java
View File

@@ -199,4 +199,6 @@ public interface DevValidMessage {
String TIMECHECK_NOT_BLANK = "是否做守时检测不能为空";
String FACTOR_FLAG_NOT_BLANK = "是否支持系数校准不能为空";
String CONDITION_TYPE_FORMAT_ERROR = "判断条件类型格式错误，请检查conditionType参数";
}