From 045023133d111be97ad52f097b4b99a2cf5a8311 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 06 九月 2024 00:22:47 +0800
Subject: [PATCH] 考核结果导出优化2
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 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..3a277bd 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -9,10 +9,7 @@
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;
@@ -51,6 +48,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() {
@@ -89,7 +88,8 @@
calculator.calculate(tMonitorVOS);
log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
}
- public void oneMonitorQualifyTask(){
+
+ public void oneMonitorQualifyTask() {
log.info("寮�濮嬭绠椾竴鏈轰竴妗ｅ悎鏍肩巼");
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -101,6 +101,7 @@
calculator.calculate(results);
log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼");
}
+
public void platformOnlineTask() {
log.info("寮�濮嬭绠楀钩鍙板湪绾跨巼");
//璁＄畻骞冲彴鍦ㄧ嚎鐜�
@@ -109,13 +110,14 @@
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);
@@ -151,14 +153,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.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