估值表优化

service-daq/src/main/java/com/simuwang/daq/service/ValuationParseService.java

@@ -206,9 +206,9 @@ public class ValuationParseService {
         if (StringUtils.isNotEmpty(headInfo)) {
             List<String> contentList = Arrays.stream(headInfo.split("@")).collect(Collectors.toList());
             for (String content : contentList) {
-                String registerNumber = "";
-                if(content != null && content.trim().matches("^[a-zA-Z0-9]+")) {
-                    registerNumber = content.length() > 6 ? content.substring(0, 6) : null;
+                String registerNumber = content.length() > 6 ? content.substring(0, 6) : null;
+                if (StrUtil.isNotBlank(registerNumber) && !ValuationDataUtils.hasChinese(registerNumber, false) && registerNumber.trim().matches("^[a-zA-z].*")) {
+                    info.setRegisterNumber(registerNumber);
                 }
                 if (StrUtil.isNotBlank(registerNumber) && !ValuationDataUtils.hasChinese(registerNumber, false)) {
                     info.setRegisterNumber(registerNumber);
@@ -224,7 +224,10 @@ public class ValuationParseService {
                         } else {
                             if (CollUtil.isNotEmpty(collect) && StrUtil.isBlank(originRegisterNumber) && !ValuationDataUtils.hasChinese(registerNumber, false)) {
                                 originRegisterNumber = collect.get(0);
-                                info.setRegisterNumber(originRegisterNumber);
+                                if(!ValuationDataUtils.hasChinese(originRegisterNumber, false)){
+                                    info.setRegisterNumber(originRegisterNumber);
+                                }
+
                             }
                             originFundName = collect.size() == 2 ? collect.get(0) : originFundName;
                             originFundName = collect.size() > 2 ? collect.get(1) : originFundName;
@@ -239,7 +242,9 @@ public class ValuationParseService {
                         } else {
                             if (CollUtil.isNotEmpty(collect) && StrUtil.isBlank(originRegisterNumber) && !ValuationDataUtils.hasChinese(registerNumber, false)) {
                                 originRegisterNumber = collect.get(0);
-                                info.setRegisterNumber(originRegisterNumber);
+                                if(!ValuationDataUtils.hasChinese(originRegisterNumber, false)){
+                                    info.setRegisterNumber(originRegisterNumber);
+                                }
                             }
                             originFundName = collect.size() == 2 ? collect.get(0) : originFundName;
                             originFundName = collect.size() > 2 ? collect.get(1) : originFundName;
@@ -253,7 +258,9 @@ public class ValuationParseService {
                         } else {
                             if (CollUtil.isNotEmpty(collect) && StrUtil.isBlank(originRegisterNumber) && !ValuationDataUtils.hasChinese(registerNumber, false)) {
                                 originRegisterNumber = collect.get(0);
-                                info.setRegisterNumber(originRegisterNumber);
+                                if(!ValuationDataUtils.hasChinese(originRegisterNumber, false)){
+                                    info.setRegisterNumber(originRegisterNumber);
+                                }
                             }
                             originFundName = collect.size() == 2 ? collect.get(0) : originFundName;
                             originFundName = collect.size() > 2 ? collect.get(1) : originFundName;