认证-去掉nio
This commit is contained in:
liyawei
+1
-1
@@ -75,7 +75,7 @@ public class CertCategoryParamsInfoEO implements Serializable {
|
||||
private String description;
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO编号", width = 15, orderNum = "1")
|
||||
@Excel(name = "*参数编号", width = 15, orderNum = "1")
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+1
-1
@@ -62,7 +62,7 @@ public class ParamsInfoEO implements Serializable {
|
||||
private String sysOrgCode;
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO编号", width = 15)
|
||||
@Excel(name = "*参数编号", width = 15)
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+31
-31
@@ -102,9 +102,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
|
||||
if (!nioNumber.matches(nioNumberRegex)) {
|
||||
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
|
||||
throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
|
||||
throw new JeroBootException("参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
|
||||
} else {
|
||||
throw new JeroBootException("NIO number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
|
||||
throw new JeroBootException("Parameter number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -114,9 +114,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
|
||||
if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
|
||||
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
|
||||
throw new JeroBootException("NIO编号已存在！");
|
||||
throw new JeroBootException("参数编号已存在！");
|
||||
} else {
|
||||
throw new JeroBootException("NIO number already exists!");
|
||||
throw new JeroBootException("Parameter number already exists!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -180,9 +180,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
|
||||
if (!nioNumber.matches(nioNumberRegex)) {
|
||||
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
|
||||
throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
|
||||
throw new JeroBootException("参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格！");
|
||||
} else {
|
||||
throw new JeroBootException("NIO number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
|
||||
throw new JeroBootException("Parameter number formatting errors, can only letters,numbers,dash (-),left slash,spaces!");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -194,9 +194,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
List<ParamsInfoEO> paramsInfoEOList = list(queryWrapper);
|
||||
if (CollectionUtil.isNotEmpty(paramsInfoEOList)) {
|
||||
if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
|
||||
throw new JeroBootException("NIO编号已存在！");
|
||||
throw new JeroBootException("参数编号已存在！");
|
||||
} else {
|
||||
throw new JeroBootException("NIO number already exists!");
|
||||
throw new JeroBootException("Parameter number already exists!");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -449,16 +449,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
explanation = "Filling explanation\n"
|
||||
+ "1.Import data starts at the third line, the first line is the header, the second line is the description, and the third line is the official data\n"
|
||||
+ "2.All fields marked with * must be filled in\n"
|
||||
+ "3.NIO Number,Params Name,Description,Control Values,Default Value fields are text type. Enter the text content\n"
|
||||
+ "3.Parameter Number,Para Name,Description,Control Values,Default Value fields are text type. Enter the text content\n"
|
||||
+ "4.Is Must,Params Batch,Duty Territory,Control Type,Control Verify fields are single type,Must match the corresponding field option in the system\n"
|
||||
+ "5.File Template fields are file type, must create a folder in the directory of the same level as the file with the name of the nio number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n";
|
||||
+ "5.File Template fields are file type, must create a folder in the directory of the same level as the file with the name of the params number and place the file in the folder. Assume that the file is saved in the A number B.pdf,Should fill in A/B.pdf\n";
|
||||
} else {
|
||||
explanation = "填写说明\n"
|
||||
+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n"
|
||||
+ "2.所有带*号的字段必须填写\n"
|
||||
+ "3.NIO编号,参数名称,参数说明,控件备选值,默认值字段为文本,填写文本内容\n"
|
||||
+ "3.参数编号,参数名称,参数说明,控件备选值,默认值字段为文本,填写文本内容\n"
|
||||
+ "4.是否必填,参数批次,责任领域,控件类型，控件校验字段为单选属性,必须和系统中的对应字段选项相匹配\n"
|
||||
+ "5.附件模板为文件属性,填写时需要在本文件同级目录下以NIO编号为名称建立文件夹,并在文件夹下放置文件,假设在A编号下放置了B.pdf,则应填写A/B.pdf\n";
|
||||
+ "5.附件模板为文件属性,填写时需要在本文件同级目录下以参数编号为名称建立文件夹,并在文件夹下放置文件,假设在A编号下放置了B.pdf,则应填写A/B.pdf\n";
|
||||
}
|
||||
|
||||
} else { // 认证类别表
|
||||
@@ -469,12 +469,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
explanation = "Filling explanation\n"
|
||||
+ "1.Import data starts at the third line, the first line is the header, the second line is the description, and the third line is the official data\n"
|
||||
+ "2.All fields marked with * must be filled in\n"
|
||||
+ "3.NIO Number,Number,Params Name,Description fields are text type. Enter the text content\n";
|
||||
+ "3.Parameter Number,Number,Para Name,Description fields are text type. Enter the text content\n";
|
||||
} else {
|
||||
explanation = "填写说明\n"
|
||||
+ "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n"
|
||||
+ "2.所有带*号的字段必须填写\n"
|
||||
+ "3.NIO编号,编号,参数名称,参数说明字段为文本,填写文本内容\n";
|
||||
+ "3.参数编号,编号,参数名称,参数说明字段为文本,填写文本内容\n";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -930,7 +930,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
// 第几个sheet页
|
||||
if (numSheet == 0) { // 企业参数表
|
||||
if (CutEnum.EN.getValue().equals(cut)) {
|
||||
String fields[] ={ "*NIO Number", "*Required", "*Para Name","*Para Batch","*Responsible Field",
|
||||
String fields[] ={ "*Parameter Number", "*Required", "*Para Name","*Para Batch","*Responsible Field",
|
||||
"Description", "*Control Component", "Validate Component", "Component Value", "Default Value", "File Template"};
|
||||
params.setImportFields(fields);
|
||||
|
||||
@@ -938,7 +938,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
List<ParamsInfoEnImport> paramsInfoEOListEn = resultEn.getList();
|
||||
copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList);
|
||||
} else {
|
||||
String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
|
||||
String fields[] ={ "*参数编号", "*是否必填", "*参数名称","*参数批次","*责任领域",
|
||||
"参数说明", "*控件类型", "控件校验", "控件备选值", "默认值", "附件模板"};
|
||||
params.setImportFields(fields);
|
||||
|
||||
@@ -950,14 +950,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
if (certCategoryMap.containsKey(sheetName)) {
|
||||
List<CertCategoryParamsInfoCnImport> list = new ArrayList<>();
|
||||
if (CutEnum.EN.getValue().equals(cut)) {
|
||||
String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"};
|
||||
String fields[] ={ "*Parameter Number", "*Number", "*Para Name","Description"};
|
||||
params.setImportFields(fields);
|
||||
|
||||
ExcelImportResult<CertCategoryParamsInfoEnImport> resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params);
|
||||
List<CertCategoryParamsInfoEnImport> listEn = resultEn.getList();
|
||||
copycertCategoryParamsInfoList(listEn, list);
|
||||
} else {
|
||||
String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"};
|
||||
String fields[] ={ "*参数编号", "*编号", "*参数名称","参数说明"};
|
||||
params.setImportFields(fields);
|
||||
|
||||
ExcelImportResult<CertCategoryParamsInfoCnImport> result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params);
|
||||
@@ -1225,7 +1225,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
Map<String, Object> resultMap = new HashMap<>();
|
||||
// nio编号
|
||||
String nioNumber = dto.getNioNumber();
|
||||
resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"20", false, cut);
|
||||
resultMap = validateMustAndLength(nioNumber, "参数编号", "Parameter Number", IsMustEnum.YES.getValue(),"20", false, cut);
|
||||
errorMsg += (String)resultMap.get("errorMsg");
|
||||
countError += (int)resultMap.get("countError");
|
||||
if (StringUtils.isNotEmpty(dto.getNioNumber())) {
|
||||
@@ -1233,18 +1233,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
|
||||
if (!nioNumber.matches(nioNumberRegex)) {
|
||||
if(CutEnum.CN.getValue().equals(cut)) {
|
||||
errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
|
||||
errorMsg += "参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
|
||||
} else {
|
||||
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
|
||||
errorMsg += "Parameter number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
|
||||
}
|
||||
countError++;
|
||||
}
|
||||
if (CollectionUtil.isNotEmpty(nioNumberImport)) {
|
||||
if (nioNumberImport.contains(dto.getNioNumber())) {
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
errorMsg += "NIO编号重复！";
|
||||
errorMsg += "参数编号重复！";
|
||||
} else {
|
||||
errorMsg += "NIO number already exists!";
|
||||
errorMsg += "Parameter number already exists!";
|
||||
}
|
||||
countError++;
|
||||
} else {
|
||||
@@ -1268,7 +1268,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
|
||||
// 参数名称
|
||||
String paramsName = dto.getParamsName();
|
||||
resultMap = validateMustAndLength(paramsName, "参数名称", "Para Name", IsMustEnum.YES.getValue(), "500", false, cut);
|
||||
resultMap = validateMustAndLength(paramsName, "参数名称", "Parameter Name", IsMustEnum.YES.getValue(), "500", false, cut);
|
||||
errorMsg += (String)resultMap.get("errorMsg");
|
||||
countError += (int)resultMap.get("countError");
|
||||
|
||||
@@ -1479,7 +1479,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
|
||||
// nio编号
|
||||
String nioNumber = ccDto.getNioNumber();
|
||||
resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO number", IsMustEnum.YES.getValue(),"20", false, cut);
|
||||
resultMap = validateMustAndLength(nioNumber, "参数编号", "Parameter number", IsMustEnum.YES.getValue(),"20", false, cut);
|
||||
errorMsg += (String)resultMap.get("errorMsg");
|
||||
countError += (int)resultMap.get("countError");
|
||||
if (StringUtils.isNotEmpty(ccDto.getNioNumber())) {
|
||||
@@ -1487,9 +1487,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
String nioNumberRegex = "^[A-Za-z0-9-/ ]+$";
|
||||
if (!nioNumber.matches(nioNumberRegex)) {
|
||||
if(CutEnum.CN.getValue().equals(cut)) {
|
||||
errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
|
||||
errorMsg += "参数编号格式错误，仅能为字母，数字，横杠(-)，左斜杠，空格；";
|
||||
} else {
|
||||
errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
|
||||
errorMsg += "Parameter number formatting errors, can only letters, numbers, dash (-),left slash,spaces; ";
|
||||
}
|
||||
countError++;
|
||||
}
|
||||
@@ -1552,9 +1552,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
.collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotBlank(reduceOne)) {
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
stringMessage.add("导入数据中NIO编号：" + reduceOne + "下存在重复认证类别；");
|
||||
stringMessage.add("导入数据中参数编号：" + reduceOne + "下存在重复认证类别；");
|
||||
} else {
|
||||
stringMessage.add("Repeat cert category exist in NIO Number: " + reduceOne + "; ");
|
||||
stringMessage.add("Repeat cert category exist in Parameter Number: " + reduceOne + "; ");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1573,9 +1573,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
|
||||
.collect(Collectors.joining(","));
|
||||
if (StringUtils.isNotBlank(reduceTwo)) {
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
stringMessage.add("导入数据中NIO编号：" + reduceTwo + "下存在重复认证编号；");
|
||||
stringMessage.add("导入数据中参数编号：" + reduceTwo + "下存在重复认证编号；");
|
||||
} else {
|
||||
stringMessage.add("Repeat number exist in NIO Number: " + reduceTwo + "; ");
|
||||
stringMessage.add("Repeat number exist in Parameter Number: " + reduceTwo + "; ");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public class CertCategoryParamsInfoCnImport {
|
||||
private String description;
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO编号", width = 15, orderNum = "1")
|
||||
@Excel(name = "*参数编号", width = 15, orderNum = "1")
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public class CertCategoryParamsInfoEnExport {
|
||||
private String description;
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO Number", width = 15, orderNum = "1")
|
||||
@Excel(name = "*Parameter Number", width = 15, orderNum = "1")
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ public class CertCategoryParamsInfoEnImport {
|
||||
private String description;
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO Number", width = 15, orderNum = "1")
|
||||
@Excel(name = "*Parameter Number", width = 15, orderNum = "1")
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import lombok.Data;
|
||||
public class ParamsInfoCnImport {
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO编号", width = 15)
|
||||
@Excel(name = "*参数编号", width = 15)
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+1
-1
@@ -45,7 +45,7 @@ public class ParamsInfoEnExport {
|
||||
private String sysOrgCode;
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO Number", width = 15)
|
||||
@Excel(name = "*Parameter Number", width = 15)
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import lombok.Data;
|
||||
public class ParamsInfoEnImport {
|
||||
|
||||
/**nio编号*/
|
||||
@Excel(name = "*NIO Number", width = 15)
|
||||
@Excel(name = "*Parameter Number", width = 15)
|
||||
@ApiModelProperty(value = "nio编号")
|
||||
private String nioNumber;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user