耳标检验

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

@@ -13,24 +13,15 @@ import java.util.regex.Pattern;
 public class EartagUtil {
     public static void main(String[] args) {
 //        String str =  "123456789123456-789";
-        String str =  "123456789123456-45，456";
-//        String str =  "123456789123456-789";
-//        String str =  "123456789123456-789";
-//        String str =  "123456789123456-789";
+//        String str =  "123456789123456-45，456";
+        String str =  "123456789123456-459，789,654,13456789123456-457";
         EartagResult eartagCollection = getEartagCollection(str);
         System.out.println(eartagCollection.toString());
     }
 
-    public static boolean isInteger(String str) {
-        return  str.matches("[0-9\\-,]+");
-    }
+
     //获取耳标集合
     public static EartagResult getEartagCollection(String eartagStr){
-        //12+3,
-        //12+3-3
-        //12+3-3,3,3,3,
-        //12+3-3,3,3,3,12+3,3
-        //12+3-3,3,3,3,12+3-3
         EartagResult eartagResult = new EartagResult();
         if ( StringUtils.isBlank(eartagStr)){
             eartagResult.setMsg("耳标号为空");
@@ -84,14 +75,13 @@ public class EartagUtil {
                         endSet.add(newEartag);
                     }
                 }catch (Exception e){
+                    System.out.println(e);
                     eartagResult.setMsg("耳标"+eartag+"格式不正确");
                     eartagResult.setSuccess(false);
                     return eartagResult;
                 }
-
-
             }else {
-                eartagResult.setMsg("耳标"+firstEartag+"格式不正确");
+                eartagResult.setMsg("耳标"+eartag+"格式不正确");
                 eartagResult.setSuccess(false);
                 return eartagResult;
             }