From b2e3a1b8665b600b379764f9569386d99c38fcd6 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 15 Jul 2022 17:10:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9-?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=B7=BB=E5=8A=A0=E5=B0=8F?=
 =?UTF-8?q?=E6=95=B0=E7=82=B9=E5=B7=A6=E6=96=9C=E6=9D=A0=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ParamsInfoEOServiceImpl.java | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
index 6230b8ec3..67cffe1bd 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java
@@ -98,12 +98,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		String nioNumber = paramsInfoEO.getNioNumber();
 		String paramsTemplateId = paramsInfoEO.getParamsTemplateId();
 		// 校验nio编号 格式：字母数字横杠（-）
-		String nioNumberRegex = "^[A-Za-z0-9-]+$";
+		String nioNumberRegex = "^[A-Za-z0-9-/. ]+$";
 		if (!nioNumber.matches(nioNumberRegex)) {
 			if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
-				throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)！");
+				throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)，小数点(.)，左斜杠，空格！");
 			} else {
-				throw new JeroBootException("NIO number formatting errors, can only letters, numbers, dash (-)!");
+				throw new JeroBootException("NIO number formatting errors, can only letters,numbers,dash (-),dot (.),left slash,spaces!");
 			}
 		}
 
@@ -176,12 +176,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 		String paramsTemplateId = paramsInfoEO.getParamsTemplateId();
 
 		// 校验nio编号 格式：字母数字横杠（-）
-		String nioNumberRegex = "^[A-Za-z0-9-]+$";
+		String nioNumberRegex = "^[A-Za-z0-9-/. ]+$";
 		if (!nioNumber.matches(nioNumberRegex)) {
 			if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) {
-				throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)！");
+				throw new JeroBootException("NIO编号格式错误，仅能为字母，数字，横杠(-)，小数点(.)，左斜杠，空格！");
 			} else {
-				throw new JeroBootException("NIO number formatting errors, can only letters, numbers, dash (-)!");
+				throw new JeroBootException("NIO number formatting errors, can only letters,numbers,dash (-),dot (.),left slash,spaces!");
 			}
 		}
 
@@ -1134,12 +1134,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 			countError += (int)resultMap.get("countError");
 			if (StringUtils.isNotEmpty(dto.getNioNumber())) {
 				// 校验nio编号 格式：字母数字横杠（-）
-				String nioNumberRegex = "^[A-Za-z0-9-]+$";
+				String nioNumberRegex = "^[A-Za-z0-9-/. ]+$";
 				if (!nioNumber.matches(nioNumberRegex)) {
 					if(CutEnum.CN.getValue().equals(cut)) {
-						errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)；";
+						errorMsg += "NIO编号格式错误，仅能为字母，数字，横杠(-)，小数点(.)，左斜杠，空格；";
 					} else {
-						errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);";
+						errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),dot (.),left slash,spaces;";
 					}
 					countError++;
 				}
@@ -1389,12 +1389,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				countError += (int)resultMap.get("countError");
 				if (StringUtils.isNotEmpty(ccDto.getNioNumber())) {
 					// 校验nio编号 格式：字母数字横杠（-）
-					String nioNumberRegex = "^[A-Za-z0-9-]+$";
+					String nioNumberRegex = "^[A-Za-z0-9-/. ]+$";
 					if (!nioNumber.matches(nioNumberRegex)) {
 						if(CutEnum.CN.getValue().equals(cut)) {
-							errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)；";
+							errorMsg += "nio编号格式错误，仅能为字母，数字，横杠(-)，小数点(.)，左斜杠，空格；";
 						} else {
-							errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-);";
+							errorMsg += "NIO number formatting errors, can only letters, numbers, dash (-),dot (.),left slash,spaces;";
 						}
 						countError++;
 					}
@@ -1420,12 +1420,12 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl<ParamsInfoEOMapper, Par
 				countError += (int)resultMap.get("countError");
 				if (StringUtils.isNotEmpty(ccDto.getParamsNumber())) {
 					// 校验编号 格式：字母数字横杠（-）
-					String numberRegex = "^[A-Za-z0-9-]+$";
+					String numberRegex = "^[A-Za-z0-9-/. ]+$";
 					if (!paramsNumber.matches(numberRegex)) {
 						if(CutEnum.CN.getValue().equals(cut)) {
-							errorMsg += "编号格式错误，仅能为字母，数字，横杠(-)；";
+							errorMsg += "编号格式错误，仅能为字母，数字，横杠(-)，小数点(.)，左斜杠，空格；";
 						} else {
-							errorMsg += "Number formatting errors, can only letters, numbers, dash (-);";
+							errorMsg += "Number formatting errors, can only letters, numbers, dash (-),dot (.),left slash,spaces;";
 						}
 						countError++;
 					}