From 2e96d8b434812815e731cdf29026eb91926e73c1 Mon Sep 17 00:00:00 2001 From: dk <1260500659@qq.com> Date: Wed, 15 Jul 2026 13:24:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(dictionary):=20=E4=BC=98=E5=8C=96=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=85=8D=E7=BD=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dictionary/pojo/param/DictDataParam.java | 23 ++++++++++--------- .../pojo/constant/SystemValidMessage.java | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java index f4b960c..3f7c3bc 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java @@ -7,59 +7,59 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.validation.constraints.*; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; /** * @author hongawen * @version 1.0.0 - * @date 2021年12月17日 15:49 + * @date 2021年2月7日 15:49 */ @Data public class DictDataParam { + private static final String DICT_DATA_NAME_REGEX = "^[\\u4e00-\\u9fa5\\w\\-\\s\\.\\/\\\\%℃、。《》（）；]{1,64}$"; @ApiModelProperty("字典类型id") @NotBlank(message = SystemValidMessage.DICT_TYPE_ID_NOT_BLANK) @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.DICT_TYPE_ID_FORMAT_ERROR) private String typeId; - @ApiModelProperty("名称") @NotBlank(message = SystemValidMessage.NAME_NOT_BLANK) - @Pattern(regexp = PatternRegex.DICT_DATA_NAME_REGEX, message = SystemValidMessage.DICT_DATA_NAME_FORMAT_ERROR) + @Pattern(regexp = DICT_DATA_NAME_REGEX, message = SystemValidMessage.DICT_DATA_NAME_FORMAT_ERROR) private String name; - @ApiModelProperty("编码") @NotBlank(message = SystemValidMessage.CODE_NOT_BLANK) @Pattern(regexp = PatternRegex.DICT_DATA_CODE_REGEX, message = SystemValidMessage.DICT_DATA_CODE_FORMAT_ERROR) private String code; - @ApiModelProperty("排序") @NotNull(message = SystemValidMessage.SORT_NOT_NULL) @Min(value = 1, message = SystemValidMessage.SORT_FORMAT_ERROR) @Max(value = 999, message = SystemValidMessage.SORT_FORMAT_ERROR) private Integer sort; - @ApiModelProperty("事件等级：0-普通；1-中等；2-严重(默认为0)") private Integer level; @ApiModelProperty("与高级算法内部Id描述对应") private Integer algoDescribe; - //todo 待定 + // todo 待定 @ApiModelProperty("字典值") private String value; /** * 是否开启使用Value值：0-关闭；1-开启(默认为0) */ - @ApiModelProperty("是否开启使用Value值") + @ApiModelProperty("是否开启使用value值") private Integer openValue; - /** * 更新操作实体 */ @@ -68,7 +68,7 @@ public class DictDataParam { public static class UpdateParam extends DictDataParam { /** - * 表Id + * 表id */ @ApiModelProperty("id") @NotBlank(message = SystemValidMessage.ID_NOT_BLANK) @@ -82,6 +82,7 @@ public class DictDataParam { @Data @EqualsAndHashCode(callSuper = true) public static class QueryParam extends BaseParam { + @ApiModelProperty("字典类型id") @NotBlank(message = SystemValidMessage.DICT_TYPE_ID_NOT_BLANK) @Pattern(regexp = PatternRegex.SYSTEM_ID, message = SystemValidMessage.DICT_TYPE_ID_FORMAT_ERROR) diff --git a/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java b/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java index 517fe18..862eed2 100644 --- a/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java +++ b/system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java @@ -87,7 +87,7 @@ public interface SystemValidMessage { String AUTO_GENERATE_FORMAT_ERROR = "是否自动生成格式错误，请检查autoGenerate参数"; String USER_ID_FORMAT_ERROR = "用户id格式错误，请检查userId参数"; - String DICT_DATA_NAME_FORMAT_ERROR = "字典数据名称格式错误，只能包含字母、数字、中文、下划线、中划线、空格、点、斜线、反斜线、百分号、摄氏度符号，长度为1~32个字符"; + String DICT_DATA_NAME_FORMAT_ERROR = "字典数据名称格式错误，只能包含字母、数字、中文、下划线、中划线、空格、点、斜线、反斜线、百分号、摄氏度、顿号、分号、句号、括号、书名号符号，长度为1~64个字符"; String DICT_DATA_CODE_FORMAT_ERROR = "字典数据编码格式错误，只能包含字母、数字、中文、下划线、中划线、空格、点、斜线、反斜线、百分号、摄氏度符号，长度为1~30个字符"; String DICT_PQ_OTHER_NAME_FORMAT_ERROR = "别名格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度最大为32个字符"; String DICT_PQ_SHOW_NAME_FORMAT_ERROR = "显示名称格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度最大为32个字符";