车

src/main/java/com/biutag/supervisiondata/service/impl/GBaseJJDServiceImpl.java

@@ -76,7 +76,6 @@ public class GBaseJJDServiceImpl implements GBaseJJDService {
         List<RiskPersonal> personals = new ArrayList<>();
         // 过滤数据
         List<String> idCodes1 = new ArrayList<>();
-
         List<String> mobiles1 = new ArrayList<>();
 
         Map<String, List<GBaseJJD>> jjdMap = new HashMap<>();

src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java

@@ -142,30 +142,26 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
                     List<List<String>> idCode = IntStream.range(0, (idCards2.size() + 9999) / 10000)
                             .mapToObj(i -> idCards2.subList(i * 10000, Math.min((i + 1) * 10000, idCards2.size())))
                             .toList();
-                    int count = 0;
+                    int count = idCode.size();
-                    log.info("身份证开始: {}", idCode.size());
                     for (List<String> arr : idCode) {
                         List<GBaseSYRKXX> list = gBaseSYRKXXRepository.list(new LambdaQueryWrapper<GBaseSYRKXX>()
                                 .select(GBaseSYRKXX::getLxdh, GBaseSYRKXX::getGmsfhm, GBaseSYRKXX::getXm, GBaseSYRKXX::getXbdm, GBaseSYRKXX::getSspcsdm)
                                 .in(GBaseSYRKXX::getGmsfhm, arr));
                         sFms.addAll(list);
-                        count++;
+                        log.info("身份证进度 | {}", --count);
-                        log.info("身份证进度 | {}", count);
                     }
                 }),
                 CompletableFutureUtil.runSyncObject(() -> {
                     List<List<String>> mobile = IntStream.range(0, (mobiles2.size() + 9999) / 10000)
                             .mapToObj(i -> mobiles2.subList(i * 10000, Math.min((i + 1) * 10000, mobiles2.size())))
                             .toList();
-                    int count = 0;
+                    int count = mobile.size();
-                    log.info("手机号开始: {}", mobile.size());
                     for (List<String> arr : mobile) {
                         List<GBaseSYRKXX> list = gBaseSYRKXXRepository.list(new LambdaQueryWrapper<GBaseSYRKXX>()
                                 .select(GBaseSYRKXX::getLxdh, GBaseSYRKXX::getGmsfhm, GBaseSYRKXX::getXm, GBaseSYRKXX::getXbdm, GBaseSYRKXX::getSspcsdm)
                                 .in(GBaseSYRKXX::getLxdh, arr));
                         lXfs.addAll(list);
-                        count++;
+                        log.info("手机号进度 | {}", --count);
-                        log.info("手机号进度 | {}", count);
                     }
                 })
         ).join();
@@ -180,10 +176,8 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
             if(ajjbxx == null) {
                 continue;
             }
-            GBaseSYRKXX rkxx = null;
+            GBaseSYRKXX rkxx = Optional.ofNullable(gBaseSHRXX.getGmsfhm()).map(idCodeMap::get)
-            if(gBaseSHRXX.getGmsfhm() != null) {
+                    .orElse(null);
-                rkxx = idCodeMap.get(gBaseSHRXX.getGmsfhm());
-            }
             if(gBaseSHRXX.getLxdh() != null && rkxx == null) {
                 List<GBaseSYRKXX> rkxxList = mobileMap.get(gBaseSHRXX.getLxdh());
                 if(rkxxList != null) {
@@ -208,9 +202,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
                 }
 
                 if(person.getIdCode() != null) {
-                    List<GBaseAJJBXX> tmp = Optional.ofNullable(shrMap.get(person.getIdCode())).orElse(new ArrayList<>());
+                    shrMap.computeIfAbsent(person.getIdCode(), k -> new ArrayList<>()).add(ajjbxx);
-                    tmp.add(ajjbxx);
-                    shrMap.put(person.getIdCode(), tmp);
                 }
                 personals.add(person);
             }
@@ -246,10 +238,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
                         }
                     }
                 }
-
+                shrMap.computeIfAbsent(person.getIdCode(), k -> new ArrayList<>()).add(ajjbxx);
-                List<GBaseAJJBXX> tmp = Optional.ofNullable(shrMap.get(person.getIdCode())).orElse(new ArrayList<>());
-                tmp.add(ajjbxx);
-                shrMap.put(person.getIdCode(), tmp);
                 personals.add(person);
             }
         }