diff --git a/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java index c9657f4e..70060542 100644 --- a/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/enums/DevResponseEnum.java @@ -7,7 +7,7 @@ public enum DevResponseEnum { //NAME_REPEAT("A001001", "名称重复"), IMPORT_DATA_FAIL("A001002", "导入数据失败"), - SERIES_AND_DEVKEY_NOT_BLANK("A001003", "加密设备的序列号和设备密钥不能为空"), + SERIES_AND_DEVKEY_NOT_BLANK("A001003", "当为加密设备时,加密设备的序列号和设备密钥不能为空"), PQ_SOURCE_GEN_NAME_ERROR("A001004", "检测源生成名称出错"), ERR_SOURCE_GEN_NAME_ERROR("A001005", "误差体系生成名称出错"), PQ_ERRSYS_GEN_NAME_ERROR("A001005", "误差体系生成名称出错"), diff --git a/detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java b/detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java index 53af3be2..2769c2b9 100644 --- a/detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java +++ b/detection/src/main/java/com/njcn/gather/device/pojo/vo/CNDevExcel.java @@ -21,9 +21,9 @@ public class CNDevExcel { @Excel(name = "预投计划*", width = 20, orderNum = "1") private String preinvestmentPlan; - @Excel(name = "设备编号*", width = 20, orderNum = "2") + @Excel(name = "设备编号(开始编号-结束编号,编号为数字)*", width = 50, orderNum = "2") @NotBlank(message = DevValidMessage.NAME_NOT_BLANK) - @Pattern(regexp = PatternRegex.DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR) + @Pattern(regexp = PatternRegex.CN_DEV_NAME_REGEX, message = DevValidMessage.NAME_FORMAT_ERROR) private String name; @Excel(name = "设备类型*", width = 20, orderNum = "3") diff --git a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java index 6432e469..b59e811f 100644 --- a/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/device/service/impl/PqDevServiceImpl.java @@ -669,6 +669,7 @@ public class PqDevServiceImpl extends ServiceImpl implements PqDevParam param = new PqDevParam.UpdateParam(); oldDevList.forEach(pqDev -> { + pqDev.setCreateDate(LocalDateTime.now().toLocalDate()); pqDev.setCreateId(pqDev.getName()); pqDev.setTimeCheckResult(TimeCheckResultEnum.UNKNOWN.getValue()); pqDev.setFactorCheckResult(FactorCheckResultEnum.UNKNOWN.getValue());