From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
index b8e8747..62778ca 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
@@ -42,8 +42,6 @@
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
private static class AreaStats {
int totalSites = 0;
- int osdAccuracySites = 0;
- int timeAccuracySites = 0;
int importantTotalSites = 0;
int importantOsdAccuracySites = 0;
@@ -102,14 +100,7 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- //鏍￠獙osd
- if (checkOsd(result)) {
- stats.osdAccuracySites++;
- }
- //鏍￠獙鏃堕棿鍋忓樊
- if (checkTime(result)) {
- stats.timeAccuracySites++;
- }
+
//閲嶇偣鐐逛綅
if (important.contains(result.getDeviceNo())) {
stats.importantTotalSites++;
@@ -142,12 +133,7 @@
if (checkIndexVideo == null) {
return null;
}
- //璋冪敤osd鏍囨敞璁＄畻鏂规硶
- Map<String, Object> param = new HashMap<>();
- param.put("totalSites", stats.totalSites);
- param.put("osdAccuracySites", stats.osdAccuracySites);
- BigDecimal osdAccuracy = osdAccuracy(param);
- checkIndexVideo.setAnnotationAccuracy(osdAccuracy);
+
//璋冪敤osd鏍囨敞璁＄畻鏂规硶 璁＄畻閲嶇偣osd鏍囨敞
Map<String, Object> importantParam = new HashMap<>();
importantParam.put("totalSites", stats.importantTotalSites);
@@ -155,12 +141,6 @@
BigDecimal imOsdAccuracy = osdAccuracy(importantParam);
checkIndexVideo.setKeyAnnotationAccuracy(imOsdAccuracy);
- //璋冪敤osd鏃堕棿鍑嗙‘鐜�
- Map<String, Object> timeParam = new HashMap<>();
- timeParam.put("totalSites", stats.totalSites);
- timeParam.put("timeAccuracySites", stats.timeAccuracySites);
- BigDecimal osdTimeAccuracy = osdTimeAccuracy(timeParam);
- checkIndexVideo.setTimingAccuracy(osdTimeAccuracy);
//璋冪敤osd鏃堕棿鍑嗙‘鐜�,璁＄畻閲嶇偣
Map<String, Object> importantTimeParam = new HashMap<>();
importantTimeParam.put("totalSites", stats.importantTotalSites);
--
Gitblit v1.8.0