Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 cd24a045bd9ee29505ddc9760d25f5d4037f4f0c

 ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java

@@ -23,7 +23,7 @@
import java.util.stream.Collectors;

/**
 * 计算车辆属性识别准确率、url可用性、大图可用性
 * 计算车辆抓拍数据准确性、url可用性、大图可用性
 * 车辆数据抽检接口
 * 获取分省厅、区域的map<k,v> k为deptId或者Province_deptId
 * 更新或新增
@@ -108,7 +108,7 @@
            stats.accuracySites++;
        }
        //重点点位为六项属性
        if (importantIds.contains(key)) {
        if (importantIds.contains(result.getExternalIndexCode())) {
            stats.importantTotalSites++;
            if (vehDiff.getImportantConPercent() >= 0.9) {
                stats.importantAccuracySites++;
@@ -118,25 +118,28 @@
        if (bigUseful.getBigUsefulPercent() >= 0.9) {
            stats.picUsabilitySites++;
        }
        //图片访问正常量 = 抽检量-异常量
        BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
        //图片抽检量
        BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
        //图片访问率>=90% 视为合格
        if (picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP).compareTo(new BigDecimal("0.9")) >= 0) {
            stats.urlUsabilitySites++;
        if (bigUseful.getSampleCount() != 0) {
            //图片访问正常量 = 抽检量-异常量
            BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
            //图片抽检量
            BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
            //图片访问率>=90% 视为合格
            if (picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP).compareTo(new BigDecimal("0.9")) >= 0) {
                stats.urlUsabilitySites++;
            }
        }
    }

    /**
     * 车辆信息采集正确率、url可用性、大图可用性
     * 车辆抓拍数据准确性、url可用性、大图可用性
     */
    private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
        CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
        if (checkIndexCar == null) {
            return null;
        }
        //调用信息采集正确率计算方法
        log.info("key:{},车辆抓拍数据准确性：totalSites：{}，importantTotalSites:{}，accuracySites:{}，importantAccuracySites:{}",key,stats.totalSites,stats.importantTotalSites,stats.accuracySites,stats.importantAccuracySites);
        //调用车辆抓拍数据准确性计算方法
        Map<String, Object> accuracyParam = new HashMap<>();
        accuracyParam.put("totalSites", stats.totalSites);
        accuracyParam.put("importantTotalSites", stats.importantTotalSites);
@@ -144,12 +147,14 @@
        accuracyParam.put("importantAccuracySites", stats.importantAccuracySites);
        BigDecimal dataAccuracy = dataAccuracy(accuracyParam);
        checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy);
        log.info("url可用性: totalSites:{},urlQualifySites:{}",stats.totalSites,stats.urlUsabilitySites);
        //调用url可用性计算方法
        Map<String, Object> urlParam = new HashMap<>();
        urlParam.put("totalSites", stats.totalSites);
        urlParam.put("urlQualifySites", stats.urlUsabilitySites);
        BigDecimal urlUsability = urlUsability(urlParam);
        checkIndexCar.setVehicleUrlAvailability(urlUsability);
        log.info("大图可用性: totalSites:{},picUsabilitySites:{}",stats.totalSites,stats.picUsabilitySites);
        //调用大图可用性计算方法
        Map<String, Object> usabilityParam = new HashMap<>();
        usabilityParam.put("totalSites", stats.totalSites);