From 64efb660b2c119c00432434c0f651f8996483f18 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 21 二月 2025 15:51:13 +0800 Subject: [PATCH] OSD大华数据格式+数据中心重点标签统计数 --- ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 18 ++++-------------- 1 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java index b7489eb..8c2dd89 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java @@ -2,32 +2,22 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ycl.platform.domain.entity.CheckIndexCar; -import com.ycl.platform.domain.entity.TMonitor; -import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult; -import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; +import com.ycl.platform.domain.entity.YwPoint; import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult; -import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.CheckIndexCarMapper; import com.ycl.platform.mapper.TMonitorMapper; +import com.ycl.platform.mapper.YwPointMapper; import com.ycl.platform.service.ICheckIndexCarService; -import com.ycl.platform.service.ITMonitorService; -import com.ycl.system.mapper.SysConfigMapper; -import constant.ApiConstants; -import constant.CheckSnapCountConstants; 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.math.RoundingMode; -import java.time.LocalDate; 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; /** @@ -56,7 +46,7 @@ @Override public void calculate(List<VehicleDeviceInspectionResult> list) { //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺 - Map<String, AreaStats> areaStatsMap = getAreaStatsMap(list); + Map<String, AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE); if (areaStatsMap == null) return; // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� @@ -83,7 +73,7 @@ AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); stats.totalSites++; //鏃堕挓鍑嗙‘鐜囧ぇ浜�90%涓哄悎鏍艰澶� - if (result.getSnapClock().getClockPercent() >= 0.9) { + if (result.getSnapClock()!=null && result.getSnapClock().getClockPercent()!=null && result.getSnapClock().getClockPercent() >= 0.9) { stats.accuracySites++; } } -- Gitblit v1.8.0