钢印码客户码 客户端加校验

src/main/java/com/jeesite/modules/mes/web/MesPdaProductController.java

@@ -24,6 +24,9 @@ import java.util.Map;
 @RequestMapping(value = "${adminPath}/mes/pda/product")
 public class MesPdaProductController extends BaseController {
 
+	private static final String STEEL_SN_PATTERN = "^[A-Z]{1,2}[0-9]+$";
+	private static final String CUSTOMER_SN_PATTERN = "^\\+KB.*$";
+
 	@Autowired
 	private MesLaserService mesLaserService;
 
@@ -45,6 +48,11 @@ public class MesPdaProductController extends BaseController {
 			resp.setMessage("客户码不能为空");
 			return resp;
 		}
+		if (!sn.matches(CUSTOMER_SN_PATTERN)) {
+			resp.setResult(Global.FALSE);
+			resp.setMessage("客户码格式错误，必须以+KB开头");
+			return resp;
+		}
 
 		String steelSn = mesLaserService.findSteelSnByCustomerSn(sn);
 		data.put("steelSn", steelSn);
@@ -59,6 +67,11 @@ public class MesPdaProductController extends BaseController {
 			resp.setMessage("钢印码不能为空");
 			return resp;
 		}
+		if (!submitSteelSn.matches(STEEL_SN_PATTERN)) {
+			resp.setResult(Global.FALSE);
+			resp.setMessage("钢印码格式错误，第一位或前两位必须为大写英文字母，后面只能为数字");
+			return resp;
+		}
 
 		if (!steelSn.equals(submitSteelSn)) {
 			resp.setResult(Global.FALSE);
@@ -88,12 +101,22 @@ public class MesPdaProductController extends BaseController {
 			resp.setMessage("客户码不能为空");
 			return resp;
 		}
+		if (!sn.matches(CUSTOMER_SN_PATTERN)) {
+			resp.setResult(Global.FALSE);
+			resp.setMessage("客户码格式错误，必须以+KB开头");
+			return resp;
+		}
 
 		if (StringUtils.isBlank(steelSn)) {
 			resp.setResult(Global.FALSE);
 			resp.setMessage("钢印码不能为空");
 			return resp;
 		}
+		if (!steelSn.matches(STEEL_SN_PATTERN)) {
+			resp.setResult(Global.FALSE);
+			resp.setMessage("钢印码格式错误，第一位或前两位必须为大写英文字母，后面只能为数字");
+			return resp;
+		}
 
 		try {
 			mesLaserService.bindSteelSnDirectly(sn, steelSn);

src/main/resources/config/application.yml

@@ -54,8 +54,8 @@ jdbc:
   # Mysql 数据库配置
   type: mysql
   driver: com.mysql.cj.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-#  url: jdbc:mysql://192.168.114.99:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  url: jdbc:mysql://192.168.114.99:3306/mes_cloud_t09?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://192.168.110.99:3306/mes_cloud?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 
   username: mes_cloud