From a1d982c75e170bc8f9bca56c14fa1c73fb7732b4 Mon Sep 17 00:00:00 2001
From: zhouyl <583641232@qq.com>
Date: Tue, 18 Jun 2024 11:21:45 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B5=8B=E8=AF=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FuncCarApiServiceImpl.java   | 44 ++++++++-----------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java b/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java
index 7a0403f..9aba329 100644
--- a/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java
+++ b/tp-functional/src/main/java/com/inscloudtech/functional/service/impl/FuncCarApiServiceImpl.java
@@ -20,6 +20,7 @@ import com.inscloudtech.functional.mapper.FuncCarApiMapper;
 import com.inscloudtech.functional.service.IFuncCarApiService;
 
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -59,34 +60,27 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService {
             lqw2.notIn(FuncCarApi::getOperId, ids);
             List<FuncCarApi> funcCarApis = baseMapper.selectList(lqw2);
             funcCarApis.addAll(records);
-            if(CollectionUtil.isNotEmpty(funcCarApis)){
-                Map<String, List<FuncCarApi>> collect = funcCarApis.stream().collect(Collectors.groupingBy(FuncCarApi::getApiUrl));
-                for (FuncCarApi record : records) {
-                    String flagVal = record.getOs() + record.getBrowser() + record.getEquipment() + record.getNetwork();
-                    if(collect.containsKey(record.getApiUrl())){
-                        List<FuncCarApi> apis = collect.get(record.getApiUrl());
-                        for (FuncCarApi api : apis) {
-                            if(api.getJsonResult().equals(record.getJsonResult())){
-                                if(!api.getOperId().equals(record.getOperId())){
-                                    String s = api.getOs() + api.getBrowser() + api.getEquipment() + api.getNetwork();
-                                    if(!flagVal.equals(s)){
-                                        record.setTestResult("兼容性测试【通过】");
-                                        break;
-                                    }else {
-                                        record.setTestResult("该记录无比对样本");
-                                    }
-                                }
-                            }else {
-                                record.setTestResult("兼容性测试【未通过】");
-                            }
+
+            Map<String, List<FuncCarApi>> collect = funcCarApis.stream().collect(Collectors.groupingBy(FuncCarApi::getApiUrl));
+            for (FuncCarApi record : records) {
+                String flagVal = record.getOs() + record.getBrowser() + record.getEquipment() + record.getNetwork();
+                List<FuncCarApi> apis = collect.get(record.getApiUrl());
+                for (FuncCarApi api : apis) {
+                    if(api.getOperId().equals(record.getOperId())){
+                        record.setTestResult("该记录无比对样本");
+                        continue;
+                    }
+                    if(api.getJsonResult().equals(record.getJsonResult())){
+                        String s = api.getOs() + api.getBrowser() + api.getEquipment() + api.getNetwork();
+                        if(!flagVal.equals(s)){
+                            record.setTestResult("兼容性测试【通过】");
+                        }else {
+                            record.setTestResult("该记录无比对样本");
                         }
                     }else {
-                        record.setTestResult("该记录无比对样本");
+                        record.setTestResult("兼容性测试【未通过】");
                     }
-                }
-            }else {
-                for (FuncCarApi record : records) {
-                    record.setTestResult("该记录无比对样本");
+                    break;
                 }
             }