弃用产品规格代码，使用其三个子项代替

src/main/java/cn/fastfun/controller/api/ProductController.java

@@ -28,35 +28,35 @@ public class ProductController {
     @PostMapping("/save")
     public ApiDTO save(@RequestBody @ApiParam(name = "SN规则对象", value = "传入json格式", required = true)Product product) {
 
-        // 针对产品规格这一项进行操作
-        if(product.getSnType().equals("产品规格")){
-            String checkSnTypeCodeResult = VerifyUtil.checkSnTypeCode(product);
-            if(!(checkSnTypeCodeResult.equals("passed"))){
-                return ApiDTO.error(500,checkSnTypeCodeResult);
-            }
-            List<Product> productSpecificationResults = ResolveUtil.resolveProductSpecification(product);
-            List<List<Product>> checkDuplicatedResults = new ArrayList<>();
-
-            for(Product productSpecificationResult:productSpecificationResults) {
-                List<Product> checkDuplicatedResult = productService.findAll(
-                        Arrays.asList(QueryParamExp.eq("snTypeCode", productSpecificationResult.getSnTypeCode()),
-                                QueryParamExp.eq("snType", productSpecificationResult.getSnType())));
-
-                checkDuplicatedResults.add(checkDuplicatedResult);
-
-                String checkSnTypeCodeResultForEach = VerifyUtil.checkSnTypeCode(productSpecificationResult);
-                if((checkSnTypeCodeResultForEach.equals("passed"))&(checkDuplicatedResult.isEmpty())){
-                        productService.save(productSpecificationResult);
-                    }
-                else if(!(checkSnTypeCodeResultForEach.equals("passed"))){
-                    return ApiDTO.error(500,checkSnTypeCodeResultForEach);
-                }
-            }
-            if((!(checkDuplicatedResults.get(0).isEmpty()))&(!(checkDuplicatedResults.get(1).isEmpty()))&(!(checkDuplicatedResults.get(2).isEmpty()))){
-                return ApiDTO.error(500,"该产品规格对应的三个规则行已存在，未进行任何保存",checkDuplicatedResults);
-            }
-            return ApiDTO.ok("保存成功,未保存的规则行id为null",productSpecificationResults);
-        }
+//        // 针对产品规格这一项进行操作
+//        if(product.getSnType().equals("产品规格")){
+//            String checkSnTypeCodeResult = VerifyUtil.checkSnTypeCode(product);
+//            if(!(checkSnTypeCodeResult.equals("passed"))){
+//                return ApiDTO.error(500,checkSnTypeCodeResult);
+//            }
+//            List<Product> productSpecificationResults = ResolveUtil.resolveProductSpecification(product);
+//            List<List<Product>> checkDuplicatedResults = new ArrayList<>();
+//
+//            for(Product productSpecificationResult:productSpecificationResults) {
+//                List<Product> checkDuplicatedResult = productService.findAll(
+//                        Arrays.asList(QueryParamExp.eq("snTypeCode", productSpecificationResult.getSnTypeCode()),
+//                                QueryParamExp.eq("snType", productSpecificationResult.getSnType())));
+//
+//                checkDuplicatedResults.add(checkDuplicatedResult);
+//
+//                String checkSnTypeCodeResultForEach = VerifyUtil.checkSnTypeCode(productSpecificationResult);
+//                if((checkSnTypeCodeResultForEach.equals("passed"))&(checkDuplicatedResult.isEmpty())){
+//                        productService.save(productSpecificationResult);
+//                    }
+//                else if(!(checkSnTypeCodeResultForEach.equals("passed"))){
+//                    return ApiDTO.error(500,checkSnTypeCodeResultForEach);
+//                }
+//            }
+//            if((!(checkDuplicatedResults.get(0).isEmpty()))&(!(checkDuplicatedResults.get(1).isEmpty()))&(!(checkDuplicatedResults.get(2).isEmpty()))){
+//                return ApiDTO.error(500,"该产品规格对应的三个规则行已存在，未进行任何保存",checkDuplicatedResults);
+//            }
+//            return ApiDTO.ok("保存成功,未保存的规则行id为null",productSpecificationResults);
+//        }
 
 
         // 校验输入的SN类型对应的编号

src/main/java/cn/fastfun/util/VerifyUtil.java

@@ -46,11 +46,11 @@ public class VerifyUtil {
                     return "电芯厂家的编号不符合规则，不能包含I或者O";
                 }
                 break;
-            case "产品规格":
-                if(sntypecode.length() != 4) {
-                    return "产品规格的编号长度必须为4";
-                }
-                break;
+//            case "产品规格":
+//                if(sntypecode.length() != 4) {
+//                    return "产品规格的编号长度必须为4";
+//                }
+//                break;
             case "化学体系":
                 if(sntypecode.length() != 1) {
                     return "化学体系的编号长度必须为1";
@@ -108,7 +108,7 @@ public class VerifyUtil {
 //                break;
             default:
                 return "sn的切片类型指明不正确，必须为" +
-                        "产品类型，PACK制造商，电芯厂家，产品规格，产品扩展，生产日期（未开放），序列号（未开放）" +
+                        "产品类型，PACK制造商，电芯厂家，化学体系，电池平台，容量，产品扩展，生产日期（未开放），序列号（未开放）" +
                         "中的一种";
 
         }