电签识别优化

blade-service/blade-business/src/main/java/org/springblade/business/utils/PDFUtil.java

@@ -135,6 +135,11 @@ public class PDFUtil {
                 // 特殊处理
                 if(textStr.indexOf("1")>=0){
                     String txt = textStr.substring(textStr.indexOf("1"));
+                    for (int i = 0; i < txt.length(); i++) {
+                        if (!Character.isDigit(txt.charAt(i))) {
+                            txt=txt.substring(0,i);
+                        }
+                    }
                     if (txt.length() >= 15 && Func.isNumeric(txt)||(Func.isNumeric(txt)&&txt.length()==8&&txt.startsWith("123"))) {
                         System.out.println(txt);
                         eVisaConfigList.add(txt);
@@ -169,7 +174,12 @@ public class PDFUtil {
                         }
                     }
                     if(textString.startsWith("1")){
-                        if (textString.length() >= 15 && Func.isNumeric(textString)) {
+                        for (int i = 0; i < textString.length(); i++) {
+                            if (!Character.isDigit(textString.charAt(i))) {
+                                textString=textString.substring(0,i);
+                            }
+                        }
+                        if (textString.length() >= 15 && Func.isNumeric(textString)||(Func.isNumeric(textString)&&textString.length()==8&&textString.startsWith("123"))) {
                             eVisaConfigList.add("✹" + textString);
                         }
                     }

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/service/impl/EVDataServiceImpl.java

@@ -570,7 +570,7 @@ public class EVDataServiceImpl implements EVDataService {
                     List<Map<String, Object>> maps3 = jdbcTemplate.queryForList(sql);
                     System.out.println("东方中讯--签字--key =" + sql);
                     if (!maps3.isEmpty()) {
-                        Map<String, List<Map<String, Object>>> peopleByAge = maps2.stream()
+                        Map<String, List<Map<String, Object>>> peopleByAge = maps3.stream()
                                 .collect(Collectors.groupingBy(hada -> (Func.toStr(hada.get("keyWord")))));
                         for (String keyId : peopleByAge.keySet()) {
                             List<Map<String, Object>> keyList = peopleByAge.get(keyId);

blade-service/blade-e-visa/src/main/java/org/springblade/evisa/utils/PDFUtils.java

@@ -67,6 +67,11 @@ public class PDFUtils {
                 // 特殊处理
                 if(textStr.indexOf("1")>=0){
                     String txt = textStr.substring(textStr.indexOf("1"));
+                    for (int i = 0; i < txt.length(); i++) {
+                        if (!Character.isDigit(txt.charAt(i))) {
+                            txt=txt.substring(0,i);
+                        }
+                    }
                     if (txt.length() >= 15 && Func.isNumeric(txt)||(Func.isNumeric(txt)&&txt.length()==8&&txt.startsWith("123"))) {
                         System.out.println(txt);
                         eVisaConfigList.add(txt);
@@ -101,7 +106,12 @@ public class PDFUtils {
                         }
                     }
                     if(textString.startsWith("1")){
-                        if (textString.length() >= 15 && Func.isNumeric(textString)) {
+                        for (int i = 0; i < textString.length(); i++) {
+                            if (!Character.isDigit(textString.charAt(i))) {
+                                textString=textString.substring(0,i);
+                            }
+                        }
+                        if (textString.length() >= 15 && Func.isNumeric(textString)||(Func.isNumeric(textString)&&textString.length()==8&&textString.startsWith("123"))) {
                             eVisaConfigList.add("✹" + textString);
                         }
                     }
@@ -165,6 +175,11 @@ public class PDFUtils {
                 // 特殊处理
                 if(textStr.indexOf("1")>=0){
                     String txt = textStr.substring(textStr.indexOf("1"));
+                    for (int i = 0; i < txt.length(); i++) {
+                        if (!Character.isDigit(txt.charAt(i))) {
+                            txt=txt.substring(0,i);
+                        }
+                    }
                     if (txt.length() >= 15 && Func.isNumeric(txt)||(Func.isNumeric(txt)&&txt.length()==8&&txt.startsWith("123"))) {
                         System.out.println(txt);
                         eVisaConfigList.add(txt);
@@ -199,7 +214,12 @@ public class PDFUtils {
                         }
                     }
                     if(textString.startsWith("1")){
-                        if (textString.length() >= 15 && Func.isNumeric(textString)) {
+                        for (int i = 0; i < textString.length(); i++) {
+                            if (!Character.isDigit(textString.charAt(i))) {
+                                textString=textString.substring(0,i);
+                            }
+                        }
+                        if (textString.length() >= 15 && Func.isNumeric(textString)||(Func.isNumeric(textString)&&textString.length()==8&&textString.startsWith("123"))) {
                             eVisaConfigList.add("✹" + textString);
                         }
                     }