耳标检验

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/EartagUtil.java

@@ -14,9 +14,11 @@ public class EartagUtil {
     public static void main(String[] args) {
 //        String str =  "123456789123456-789";
 //        String str =  "123456789123456-45，456";
-        String str =  "262060202417151-153，155，160，169，171，173，190，195，262060202549131-150";
+        String str =  "262070202253993-4015";
         EartagResult eartagCollection = getEartagCollection(str);
         System.out.println(eartagCollection.toString());
+        System.out.println(eartagCollection.getEartagList().size());
+        System.out.println(eartagCollection.getEartagSet().size());
     }
 
 
@@ -41,8 +43,8 @@ public class EartagUtil {
         Set<String> endSet  = new HashSet<>();
         String firstEartag = split[0];
 
-        if (firstEartag.length() != 15 && firstEartag.length() != 19){
-            eartagResult.setMsg("耳标"+firstEartag+"格式不正确");
+        if (firstEartag.length() != 15 && firstEartag.length() != 19&& firstEartag.length() != 20){
+            eartagResult.setMsg("耳标号格式不正确");
             eartagResult.setSuccess(false);
             return eartagResult;
         }
@@ -64,7 +66,7 @@ public class EartagUtil {
                     Integer eartagStart = Integer.parseInt(eartag.substring(12, 15));
                     Integer eartagEnd = Integer.parseInt(eartag.substring(16));
                     if (eartagEnd <= eartagStart){
-                        eartagResult.setMsg("耳标"+eartag+"格式不正确");
+                        eartagResult.setMsg("耳标号格式不正确");
                         eartagResult.setSuccess(false);
                         return eartagResult;
                     }
@@ -76,12 +78,34 @@ public class EartagUtil {
                     }
                 }catch (Exception e){
                     System.out.println(e);
-                    eartagResult.setMsg("耳标"+eartag+"格式不正确");
+                    eartagResult.setMsg("耳标号格式不正确");
+                    eartagResult.setSuccess(false);
+                    return eartagResult;
+                }
+            } else   if (eartagLength ==20){
+                eartagPrefix =  eartag.substring(0,11);
+                try {
+                    Integer eartagStart = Integer.parseInt(eartag.substring(11, 15));
+                    Integer eartagEnd = Integer.parseInt(eartag.substring(16));
+                    if (eartagEnd <= eartagStart){
+                        eartagResult.setMsg("耳标"+eartag+"格式不正确");
+                        eartagResult.setSuccess(false);
+                        return eartagResult;
+                    }
+
+                    for (Integer integer = eartagStart; integer <= eartagEnd; integer++) {
+                        newEartag =  eartagPrefix +getStr(integer,4);
+                        endList.add(newEartag);
+                        endSet.add(newEartag);
+                    }
+                }catch (Exception e){
+                    System.out.println(e);
+                    eartagResult.setMsg("耳标号格式不正确");
                     eartagResult.setSuccess(false);
                     return eartagResult;
                 }
             }else {
-                eartagResult.setMsg("耳标"+eartag+"格式不正确");
+                eartagResult.setMsg("耳标号格式不正确");
                 eartagResult.setSuccess(false);
                 return eartagResult;
             }