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

bug修复

Browse Source
This commit is contained in:
caozehui
2025-04-08 10:10:12 +08:00
parent 42701db2d5
commit c7a45b5500
24 changed files with 170 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictDataParam.java
View File

@@ -26,13 +26,13 @@ public class DictDataParam {
@ApiModelProperty("名称")
@NotBlank(message = SystemValidMessage.NAME_NOT_BLANK)
// @Pattern(regexp = PatternRegex.DICT_NAME_REGEX, message = SystemValidMessage.NAME_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.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_CODE_REGEX, message = SystemValidMessage.CODE_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.DICT_DATA_CODE_REGEX, message = SystemValidMessage.DICT_DATA_CODE_FORMAT_ERROR)
private String code;

4
system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictPqParam.java
View File

@@ -15,7 +15,7 @@ public class DictPqParam {
@ApiModelProperty("名称")
@NotBlank(message = SystemValidMessage.NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.DICT_NAME_REGEX, message = SystemValidMessage.NAME_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.DICT_NAME_REGEX, message = SystemValidMessage.DICT_TYPE_NAME_FORMAT_ERROR)
private String name;
@ApiModelProperty("相别")
@@ -27,9 +27,11 @@ public class DictPqParam {
private String dataType;
@ApiModelProperty("别名，默认与名称相同")
@Pattern(regexp = PatternRegex.DICT_PQ_OTHER_NAME_REGEX, message = SystemValidMessage.DICT_PQ_OTHER_NAME_FORMAT_ERROR)
private String otherName;
@ApiModelProperty("显示名称")
@Pattern(regexp = PatternRegex.DICT_PQ_OTHER_NAME_REGEX, message = SystemValidMessage.DICT_PQ_SHOW_NAME_FORMAT_ERROR)
private String showName;
@ApiModelProperty("排序")

4
system/src/main/java/com/njcn/gather/system/dictionary/pojo/param/DictTypeParam.java
View File

@@ -19,12 +19,12 @@ public class DictTypeParam {
@ApiModelProperty("名称")
@NotBlank(message = SystemValidMessage.NAME_NOT_BLANK)
@Pattern(regexp = PatternRegex.DICT_NAME_REGEX, message = SystemValidMessage.NAME_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.DICT_NAME_REGEX, message = SystemValidMessage.DICT_TYPE_NAME_FORMAT_ERROR)
private String name;
@ApiModelProperty("编码")
@NotBlank(message = SystemValidMessage.CODE_NOT_BLANK)
@Pattern(regexp = PatternRegex.DICT_CODE_REGEX, message = SystemValidMessage.CODE_FORMAT_ERROR)
@Pattern(regexp = PatternRegex.DICT_CODE_REGEX, message = SystemValidMessage.DICT_TYPE_CODE_FORMAT_ERROR)
private String code;

9
system/src/main/java/com/njcn/gather/system/pojo/constant/SystemValidMessage.java
View File

@@ -21,7 +21,8 @@ public interface SystemValidMessage {
String NAME_NOT_BLANK = "名称不能为空，请检查name参数";
String NAME_FORMAT_ERROR = "名称格式错误，请检查name参数";
String DICT_TYPE_NAME_FORMAT_ERROR = "名称格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度为1~32个字符";
String DICT_TYPE_CODE_FORMAT_ERROR = "编码格式错误，只能包含字母、数字、下划线，长度为1~30个字符";
String INDUSTRY_NOT_BLANK = "行业不能为空，请检查industry参数";
String INDUSTRY_FORMAT_ERROR = "行业格式错误，请检查industry参数";
@@ -29,8 +30,6 @@ public interface SystemValidMessage {
String CODE_NOT_BLANK = "编码不能为空，请检查code参数";
String CODE_FORMAT_ERROR = "编码格式错误，请检查code参数";
String SORT_NOT_NULL = "排序不能为空，请检查sort参数";
String SORT_FORMAT_ERROR = "排序范围在1至999，请检查sort参数";
@@ -88,4 +87,8 @@ 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_CODE_FORMAT_ERROR = "字典数据编码格式错误，只能包含字母、数字、中文、下划线、中划线、空格、点、斜线、反斜线、百分号、摄氏度符号，长度为1~30个字符";
String DICT_PQ_OTHER_NAME_FORMAT_ERROR = "别名格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度最大为32个字符";
String DICT_PQ_SHOW_NAME_FORMAT_ERROR = "显示名称格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度最大为32个字符";
}