From 2705449e4cf84b135bceb49df8b583987abf1f14 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 21 二月 2025 10:17:02 +0800
Subject: [PATCH] 缩短线程池存活时长
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 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 b559d09..615ddfa 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -6,19 +6,21 @@
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;
-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.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;
@@ -32,6 +34,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 瑙嗛璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -51,6 +54,8 @@
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() {
@@ -59,9 +64,13 @@
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰閲嶇偣鐐逛綅鍦ㄧ嚎鐜囧拰鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
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);
+ .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("缁撴潫璁＄畻鐐逛綅鍦ㄧ嚎鐜�");
@@ -76,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("缁撴潫璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�");
@@ -84,12 +98,17 @@
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("缁撴潫璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
}
- public void oneMonitorQualifyTask(){
+
+ public void oneMonitorQualifyTask() {
log.info("寮�濮嬭绠椾竴鏈轰竴妗ｅ悎鏍肩巼");
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -101,6 +120,7 @@
calculator.calculate(results);
log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼");
}
+
public void platformOnlineTask() {
log.info("寮�濮嬭绠楀钩鍙板湪绾跨巼");
//璁＄畻骞冲彴鍦ㄧ嚎鐜�
@@ -109,14 +129,16 @@
calculator.calculate(list);
log.info("缁撴潫璁＄畻骞冲彴鍦ㄧ嚎鐜�");
}
+
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);
log.info("缁撴潫璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼");
@@ -125,7 +147,7 @@
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
*/
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void videoSecurity() {
ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
List<CheckIndexVideo> list = checkIndexVideoMapper.selectAndDeptName();
@@ -151,14 +173,23 @@
count++;
}
}
- imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score).divide(new BigDecimal(100),4, RoundingMode.HALF_UP));
+ imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP));
// 鑾峰彇瀛楀吀鍊�-鎬绘暟
int onlineAssetsTotal = Integer.parseInt(DictUtils.getDictValue("online_assets_total", checkIndexVideo.getDeptName()));
imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
imageResourceSecurities.add(imageResourceSecurity);
+ //鑾峰彇鏈�杩戜竴娆℃暟鎹墜鍔ㄦ墦鍒�
+ ImageResourceSecurity latest = imageResourceSecurityMapper.getLatest(checkIndexVideo.getDeptId(),new Date());
+ imageResourceSecurity.setBoundaryIntegrity(latest ==null?BigDecimal.ONE:latest.getBoundaryIntegrity());
// 鏇存柊鎸囨爣鏁版嵁
- checkIndexVideo.setImageResourceSecurity(imageResourceSecurity.getPlatformOnline().add(imageResourceSecurity.getPropertyAccuracy().add(imageResourceSecurity.getWeakPassword().add(imageResourceSecurity.getRiskProperty()))).multiply(NUM));
+ checkIndexVideo.setImageResourceSecurity(
+ imageResourceSecurity.getPlatformOnline()
+ .add(imageResourceSecurity.getPropertyAccuracy()
+ .add(imageResourceSecurity.getWeakPassword()
+ .add(imageResourceSecurity.getRiskProperty()))).multiply(NUM)
+ .add(imageResourceSecurity.getBoundaryIntegrity()).multiply(new BigDecimal("0.45"))
+ );
checkIndexVideoMapper.updateById(checkIndexVideo);
}
imageResourceSecurityService.saveBatch(imageResourceSecurities);
--
Gitblit v1.8.0