|
@ -20,6 +20,7 @@ import com.inscloudtech.functional.mapper.FuncCarApiMapper; |
|
|
import com.inscloudtech.functional.service.IFuncCarApiService; |
|
|
import com.inscloudtech.functional.service.IFuncCarApiService; |
|
|
|
|
|
|
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
|
|
|
import java.util.function.Consumer; |
|
|
import java.util.stream.Collectors; |
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
@ -59,34 +60,27 @@ public class FuncCarApiServiceImpl implements IFuncCarApiService { |
|
|
lqw2.notIn(FuncCarApi::getOperId, ids); |
|
|
lqw2.notIn(FuncCarApi::getOperId, ids); |
|
|
List<FuncCarApi> funcCarApis = baseMapper.selectList(lqw2); |
|
|
List<FuncCarApi> funcCarApis = baseMapper.selectList(lqw2); |
|
|
funcCarApis.addAll(records); |
|
|
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 { |
|
|
}else { |
|
|
record.setTestResult("该记录无比对样本"); |
|
|
|
|
|
|
|
|
record.setTestResult("兼容性测试【未通过】"); |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
for (FuncCarApi record : records) { |
|
|
|
|
|
record.setTestResult("该记录无比对样本"); |
|
|
|
|
|
|
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|