From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 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 a5d1da3..edbee39 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -6,17 +6,17 @@
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.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.domain.vo.PlatformOnlineVO;
import com.ycl.platform.domain.vo.TMonitorVO;
-import com.ycl.platform.mapper.CheckIndexVideoMapper;
-import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
-import com.ycl.platform.mapper.PlatformOnlineMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.*;
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.springframework.beans.factory.annotation.Autowired;
@@ -51,19 +51,15 @@
private final IImageResourceSecurityService imageResourceSecurityService;
private final CheckIndexVideoMapper checkIndexVideoMapper;
private final ImageResourceSecurityDetailMapper imageResourceSecurityDetailMapper;
+ private final ImageResourceSecurityMapper imageResourceSecurityMapper;
+
private static final BigDecimal NUM = new BigDecimal("0.15");
public void siteOnlineTask() {
log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼");
- 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<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
+ List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(CheckConstants.Rule_Category_Video,null);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
- calculator.calculate(results);
+ calculator.calculate(tMonitorResults);
log.info("缁撴潫璁＄畻鐐逛綅鍦ㄧ嚎鐜�");
}
@@ -84,9 +80,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("缁撴潫璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
}
@@ -115,10 +115,10 @@
public void osdTask() {
log.info("寮�濮嬭绠桹sd鏍囨敞銆佹椂闂村噯纭巼");
//璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼
-// Date yesterday = DateUtils.addDays(new Date(), -1);
+ Date yesterday = DateUtils.addDays(new Date(), -1);
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ .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);
@@ -128,8 +128,7 @@
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
*/
- //鎵嬪姩鎵撳垎鍙栨渶杩戞暟鎹紝鍓嶇椤甸潰鍔犳墦鍒嗚鍒欐彁绀�
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void videoSecurity() {
ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
List<CheckIndexVideo> list = checkIndexVideoMapper.selectAndDeptName();
@@ -161,6 +160,9 @@
imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
imageResourceSecurities.add(imageResourceSecurity);
+ //鑾峰彇鏈�杩戜竴娆℃暟鎹墜鍔ㄦ墦鍒�
+ ImageResourceSecurity latest = imageResourceSecurityMapper.getLatest(checkIndexVideo.getDeptId(),new Date());
+ imageResourceSecurity.setBoundaryIntegrity(latest.getBoundaryIntegrity());
// 鏇存柊鎸囨爣鏁版嵁
checkIndexVideo.setImageResourceSecurity(
imageResourceSecurity.getPlatformOnline()
--
Gitblit v1.8.0