From db75b45e9a7ce347162b8d3a36e4a7f46cfe199e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 10 二月 2025 15:30:18 +0800
Subject: [PATCH] 核算导出单独对录像扣分的数量做处理
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index 3a277bd..72c32a6 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -6,6 +6,8 @@
import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.entity.ImageResourceSecurity;
import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
+import com.ycl.platform.domain.form.VideoExportForm;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.domain.vo.PlatformOnlineVO;
import com.ycl.platform.domain.vo.TMonitorVO;
@@ -13,9 +15,12 @@
import com.ycl.platform.service.IImageResourceSecurityService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.DictUtils;
+import constant.ApiConstants;
import constant.CalculationStrategyConstants;
+import constant.CheckConstants;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -29,6 +34,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 瑙嗛璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -59,8 +65,12 @@
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
-
List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
+ //浼樹簯涓婃湁杞﹁締鍜屼汉鑴哥殑璁惧鏁版嵁锛岄渶瑕佽繃婊ゅ嚭瑙嗛璁惧
+ List<String> videoIds = monitorMapper.getVideoIds();
+ if(!CollectionUtils.isEmpty(results)){
+ results = results.stream().filter(result -> videoIds.contains(result.getNo())).collect(Collectors.toList());
+ }
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
calculator.calculate(results);
log.info("缁撴潫璁＄畻鐐逛綅鍦ㄧ嚎鐜�");
@@ -75,6 +85,11 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
+ //浼樹簯涓婃湁杞﹁締鍜屼汉鑴哥殑璁惧鏁版嵁锛岄渶瑕佽繃婊ゅ嚭瑙嗛璁惧
+ List<String> videoIds = monitorMapper.getVideoIds();
+ if(!CollectionUtils.isEmpty(results)){
+ results = results.stream().filter(result -> videoIds.contains(result.getNo())).collect(Collectors.toList());
+ }
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
calculator.calculate(results);
log.info("缁撴潫璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�");
@@ -83,9 +98,13 @@
public void oneMonitorFileTask() {
log.info("寮�濮嬭绠椾竴鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
//璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
- List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ Query query = new Query();
+ query.addCriteria(Criteria
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+ List<MonitorQualifyResult> results = mongoTemplate.find(query, MonitorQualifyResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate);
- calculator.calculate(tMonitorVOS);
+ calculator.calculate(results);
log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
}
@@ -119,6 +138,7 @@
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class);
+
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
calculator.calculate(results);
log.info("缁撴潫璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼");
@@ -127,7 +147,7 @@
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
*/
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void videoSecurity() {
ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
List<CheckIndexVideo> list = checkIndexVideoMapper.selectAndDeptName();
@@ -161,7 +181,7 @@
imageResourceSecurities.add(imageResourceSecurity);
//鑾峰彇鏈�杩戜竴娆℃暟鎹墜鍔ㄦ墦鍒�
ImageResourceSecurity latest = imageResourceSecurityMapper.getLatest(checkIndexVideo.getDeptId(),new Date());
- imageResourceSecurity.setBoundaryIntegrity(latest.getBoundaryIntegrity());
+ imageResourceSecurity.setBoundaryIntegrity(latest ==null?BigDecimal.ONE:latest.getBoundaryIntegrity());
// 鏇存柊鎸囨爣鏁版嵁
checkIndexVideo.setImageResourceSecurity(
imageResourceSecurity.getPlatformOnline()
--
Gitblit v1.8.0