diff --git a/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java index 88a54820..546f6b4e 100644 --- a/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysDtlsParam.java @@ -38,11 +38,6 @@ public class PqErrSysDtlsParam { @ApiModelProperty(value = "是否包含结束值", required = true) private Integer endFlag; -// @ApiModelProperty(value = "单位", required = true) -// @NotBlank(message = DeviceValidMessage.UNIT_NOT_BLANK) -// @Pattern(regexp = PatternRegex.SYSTEM_ID, message = DeviceValidMessage.UNIT_FORMAT_ERROR) -// private String unit; - @ApiModelProperty(value = "判断条件值类型", required = true) private Integer conditionType; diff --git a/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java index dd5c8fcf..ef966574 100644 --- a/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java +++ b/detection/src/main/java/com/njcn/gather/err/pojo/param/PqErrSysParam.java @@ -41,7 +41,6 @@ public class PqErrSysParam { private Integer enable; @ApiModelProperty(value = "误差详情列表", required = true) - @Valid private List pqErrSysDtlsList; @Data diff --git a/detection/src/main/java/com/njcn/gather/pojo/constant/DetectionValidMessage.java b/detection/src/main/java/com/njcn/gather/pojo/constant/DetectionValidMessage.java index e6ce7768..40feb562 100644 --- a/detection/src/main/java/com/njcn/gather/pojo/constant/DetectionValidMessage.java +++ b/detection/src/main/java/com/njcn/gather/pojo/constant/DetectionValidMessage.java @@ -82,7 +82,7 @@ public interface DetectionValidMessage { String STANDARD_NAME_NOT_BLANK = "标准号不能为空,请检查standardName参数"; - String STANDARD_NAME_FORMAT_ERROR = "标准号格式错误,只能包含字母、数字、中文、下划线、中划线、点号、空格,长度为1-32个字符"; + String STANDARD_NAME_FORMAT_ERROR = "标准号格式错误,只能包含字母、数字、中文、下划线、中划线、点号、空格、斜杠、反斜杠,长度为1-32个字符"; String STANDARD_TIME_NOT_BLANK = "标准推行年份不能为空,请检查standardTime参数";