From b890afe0d93b9856bcfe6829ec51a69e232ce0d7 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期六, 31 八月 2024 18:01:27 +0800 Subject: [PATCH] 图像安全资源管理整合,车辆抓拍数据完整和准确计算公式修改 --- ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java index 8863fb4..5f5eb53 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java @@ -1,26 +1,23 @@ package com.ycl.calculate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ycl.platform.base.CheckIndex; import com.ycl.platform.domain.entity.CheckIndexCar; -import com.ycl.platform.domain.entity.TMonitor; -import com.ycl.platform.domain.result.HK.CrossDetailResult; import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult; import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.CheckIndexCarMapper; import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.service.ICheckIndexCarService; -import com.ycl.platform.service.ITMonitorService; -import com.ycl.system.mapper.SysConfigMapper; import constant.ApiConstants; -import constant.CheckConstants; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import utils.DateUtils; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; @@ -31,6 +28,7 @@ * 鏇存柊鎴栨柊澧� */ @Component +@Slf4j public class CarDataIntegrityCalculation extends IndexCalculationServe implements CalculationStrategy<DataIntegrityMonitoringResult> { @Autowired private CheckIndexCarMapper checkIndexCarMapper; @@ -50,6 +48,7 @@ @Override public void calculate(List<DataIntegrityMonitoringResult> list) { if (CollectionUtils.isEmpty(list)) { + log.info("鏁版嵁涓虹┖"); return; } //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap @@ -99,8 +98,8 @@ if (result.getMainNoIntegrityPercent() <= 0.1) { stats.integritySites++; } - //閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬� - if (importantIds.contains(key)) { + //閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬у畬鏁� + if (importantIds.contains(result.getExternalIndexCode())) { stats.importantTotalSites++; if (result.getNoIntegrityPercent() <= 0.1) { stats.importantIntegritySites++; @@ -117,13 +116,13 @@ return null; } //璋冪敤璁$畻鏂规硶 - Map<String, Object> param = new HashMap<>(); - param.put("totalSites", stats.totalSites); - param.put("importantTotalSites", stats.importantTotalSites); - param.put("integritySites", stats.integritySites); - param.put("importantIntegritySites", stats.importantIntegritySites); - BigDecimal dataIntegrity = dataIntegrity(param); - checkIndexCar.setVehicleCaptureIntegrity(dataIntegrity); + Map<String, Object> param = new HashMap<>(); + param.put("totalSites", stats.totalSites); + param.put("importantTotalSites", stats.importantTotalSites); + param.put("integritySites", stats.integritySites); + param.put("importantIntegritySites", stats.importantIntegritySites); + BigDecimal dataIntegrity = dataIntegrity(param); + checkIndexCar.setVehicleCaptureIntegrity(dataIntegrity); return checkIndexCar; } -- Gitblit v1.8.0