From b85542765637358cb1473629d0ea767ac076aec3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 23 九月 2025 13:36:26 +0800
Subject: [PATCH] 图片压缩
---
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 45 +++++++++++----------------------------------
1 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index 32c1e2f..1595b0b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -2,15 +2,11 @@
import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.result.HK.VehicleDeviceSamplingResult;
-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 constant.ApiConstants;
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;
@@ -19,8 +15,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 璁＄畻杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
@@ -34,8 +28,6 @@
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
- private TMonitorMapper monitorMapper;
- @Autowired
private ICheckIndexCarService checkIndexCarService;
//鍖哄煙杞﹁締鎶芥鎸囨爣
@@ -46,16 +38,16 @@
int accuracySites = 0;
//灞炴�ц瘑鍒噯纭殑閲嶇偣鐐逛綅鏁�
int importantAccuracySites = 0;
- //url鍙闂殑鐐逛綅鏁�
- int urlUsabilitySites = 0;
//鍥剧墖鍙敤鐨勭偣浣嶆暟
int picUsabilitySites = 0;
+ //鍥剧墖鎬荤偣浣嶆暟
+ int picSites = 0;
}
@Override
public void calculate(List<VehicleDeviceSamplingResult> list) {
//鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
- Map<String, CarDeviceSampleCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ Map<String, CarDeviceSampleCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
@@ -94,31 +86,24 @@
stats.importantAccuracySites++;
}
}
- //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸
- if (bigUseful.getBigUsefulPercent() >= 0.9) {
- stats.picUsabilitySites++;
- }
- 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++;
+ //鍙绠楁娊妫�鐨�
+ if(bigUseful.getSampleCount() !=0){
+ stats.picSites++;
+ //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸,
+ if (bigUseful.getBigUsefulPercent() >= 0.9) {
+ stats.picUsabilitySites++;
}
}
}
/**
- * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�佸ぇ鍥惧彲鐢ㄦ��
*/
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锛歿}锛宨mportantTotalSites:{}锛宎ccuracySites:{}锛宨mportantAccuracySites:{}", key, stats.totalSites, stats.importantTotalSites, stats.accuracySites, stats.importantAccuracySites);
//璋冪敤杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬ц绠楁柟娉�
Map<String, Object> accuracyParam = new HashMap<>();
accuracyParam.put("totalSites", stats.totalSites);
@@ -127,17 +112,9 @@
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);
+ usabilityParam.put("totalSites", stats.picSites);
usabilityParam.put("picUsabilitySites", stats.picUsabilitySites);
BigDecimal picUsability = picUsability(usabilityParam);
checkIndexCar.setVehiclePictureAvailability(picUsability);
--
Gitblit v1.8.0