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

25
detection/src/main/java/com/njcn/gather/pojo/constant/DetectionValidMessage.java
View File

@@ -10,9 +10,9 @@ public interface DetectionValidMessage {
String ID_NOT_BLANK = "id不能为空，请检查id参数";
String ID_FORMAT_ERROR = "id格式错误，请检查id参数";
String NAME_NOT_BLANK = "名称不能为空";
String ICD_NAME_FORMAT_ERROR = "名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号，长度为1-50个字符";
String ICD_NAME_FORMAT_ERROR = "名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
String ICD_PATH_NOT_BLANK = "icd存储路径不能为空";
String ICD_PATH_FORMAT_ERROR = "ICD路径格式错误";
String ICD_PATH_FORMAT_ERROR = "ICD路径格式错误，只能包含字母、数字、下划线、中划线、空格，长度为1-50个字符";
String ICD_NOT_BLANK = "ICD不能为空";
String POWER_NOT_BLANK = "工作电源不能为空";
String VOLT_NOT_BLANK = "额定电压不能为空";
@@ -21,14 +21,14 @@ public interface DetectionValidMessage {
String DEV_CHNS_RANGE_ERROR = "通道数格式错误";
String INDEX_NOT_NULL = "index不能为空";
String VALUE_TYPE_NOT_BLANK = "脚本值类型不能为空";
String SCRIPT_NAME_FORMAT_ERROR = "脚本名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号，长度为1-50个字符";
String SCRIPT_NAME_FORMAT_ERROR = "脚本名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
String SCRIPT_VOLT_FORMAT_ERROR = "检测脚本额定电压格式错误，请检查ratedVolt参数";
String SCRIPT_CURR_FORMAT_ERROR = "检测脚本额定电流格式错误，请检查ratedCurr参数";
String PORT_RANGE_ERROR = "端口号范围错误，请检查port参数";
String NAME_FORMAT_ERROR = "名称格式错误，请检查name参数";
String NAME_FORMAT_ERROR = "名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
String PATTERN_NOT_BLANK = "模式不能为空，请检查pattern参数";
String PATTERN_NOT_BLANK = "模式不能为空，请检查patternId参数";
String DEV_TYPE_NOT_BLANK = "设备类型不能为空";
@@ -62,7 +62,7 @@ public interface DetectionValidMessage {
String RECHECK_NUM_FORMAT_ERROR = "检测次数格式错误，请检查recheckNum参数";
String PATTERN_FORMAT_ERROR = "模式格式错误，请检查pattern参数";
String PATTERN_FORMAT_ERROR = "模式格式错误，请检查patternId参数";
String SOURCE_IDS_NOT_EMPTY = "检测源ID不能为空，请检查sourceIds参数";
@@ -76,15 +76,15 @@ public interface DetectionValidMessage {
String PLAN_ID_FORMAT_ERROR = "检测计划ID格式错误，请检查planId参数";
String STANDARD_TIME_FORMAT_ERROR = "标准推行时间格式错误，请检查standardTime参数";
String STANDARD_TIME_FORMAT_ERROR = "标准推行年份格式错误，请检查standardTime参数";
String SCRIPT_TYPE_NOT_BLANK = "检测脚本类型不能为空，请检查scriptType参数";
String STANDARD_NAME_NOT_BLANK = "参照标准名称不能为空，请检查standardName参数";
String STANDARD_NAME_NOT_BLANK = "标准号不能为空，请检查standardName参数";
String STANDARD_NAME_FORMAT_ERROR = "参照标准名称格式错误，请检查standardName参数";
String STANDARD_NAME_FORMAT_ERROR = "标准号格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
String STANDARD_TIME_NOT_BLANK = "标准推行时间不能为空，请检查standardTime参数";
String STANDARD_TIME_NOT_BLANK = "标准推行年份不能为空，请检查standardTime参数";
String SCRIPT_TYPE_FORMAT_ERROR = "检测脚本类型格式错误，请检查scriptType参数";
@@ -174,4 +174,9 @@ public interface DetectionValidMessage {
String SORT_NOT_NULL = "排序不能为空";
String PREINVESTMENT_PLAN_NOT_BLANK = "预投资计划不能为空";
String TIMECHECK_NOT_NULL = "是否做守时检测不能为空";
String CN_DEV_NAME_FORMAT_ERROR = "设备名称格式错误，只能包含数字、中划线，长度为1-32个字符";
String DEV_CREATE_ID_FORMAT_ERROR = "装置编号格式错误，只能包含字母、数字、中文、下划线、中划线、空格，长度为1-32位";
String DEV_TYPE_NAME_FORMAT_ERROR = "设备类型名称格式错误，只能包含字母、数字、中文、下划线、中划线、点号、空格，长度为1-32个字符";
String REPORT_NAME_NOT_BLANK = "报告模板不能为空";
}

5
detection/src/main/java/com/njcn/gather/pojo/enums/DetectionResponseEnum.java
View File

@@ -26,6 +26,7 @@ public enum DetectionResponseEnum {
ICD_PATH_NAME_REPEAT("A02012", "icd名称重复"),
ERR_SYS_BOUND_NOT_DELETE("A02013", "误差体系已被计划所绑定，无法删除！"),
ERR_SYS_REPEAT("A02014", "已存在相同标准号、标准推行年份、适用设备等级的误差体系！"),
SCRIPT_NAME_REPEAT("A02015","脚本名称重复"),
IMPORT_DATA_FAIL("A02040", "导入数据失败"),
@@ -46,7 +47,9 @@ public enum DetectionResponseEnum {
DEVICE_DIS_ERROR("A02055", "装置配置异常"),
DEVICE_DELETE("A02056", "设备无法删除，已绑定计划！"),
CREATE_DIRECTORY_FAILED("A02057", "创建目录失败"),
DELETE_DIRECTORY_FAILED("A02058", "删除目录失败");
DELETE_DIRECTORY_FAILED("A02058", "删除目录失败"),
CN_DEV_NAME_FORMAT_ERROR("A02059","设备名称格式错误，只能包含数字，长度为1-32位"),
PROVINCE_DEV_NAME_FORMAT_ERROR("A02060","设备名称格式错误，只能包含字母、数字、下划线、中划线、空格，长度为1-32位" );
private final String code;