From bb4c01a00c8203fdadf38aca9290227f6682655f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 02 九月 2024 17:55:33 +0800
Subject: [PATCH] 宇视OSD打通,OSD整体打通

---
 ycl-server/src/main/java/com/ycl/task/VideoTask.java |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 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 b8f8a53..a5d1da3 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -27,6 +27,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -53,6 +54,7 @@
     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();
@@ -62,9 +64,11 @@
         List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
         calculator.calculate(results);
+        log.info("缁撴潫璁$畻鐐逛綅鍦ㄧ嚎鐜�");
     }
 
     public void videoUsabilityTask() {
+        log.info("寮�濮嬭绠楀綍鍍忓彲鐢ㄧ巼鍜岄噸鐐瑰綍鍍忓彲鐢ㄧ巼");
         Date yesterday = DateUtils.addDays(new Date(), -1);
         //璁$畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�
         Query query = new Query();
@@ -74,15 +78,20 @@
         List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
         calculator.calculate(results);
+        log.info("缁撴潫璁$畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�");
     }
 
     public void oneMonitorFileTask() {
+        log.info("寮�濮嬭绠椾竴鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�");
         //璁$畻涓�鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�
         List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate);
         calculator.calculate(tMonitorVOS);
+        log.info("缁撴潫璁$畻涓�鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�");
     }
-    public void oneMonitorQualifyTask(){
+
+    public void oneMonitorQualifyTask() {
+        log.info("寮�濮嬭绠椾竴鏈轰竴妗e悎鏍肩巼");
         //璁$畻涓�鏈轰竴妗e悎鏍肩巼
         Date yesterday = DateUtils.addDays(new Date(), -1);
         Query query = new Query();
@@ -91,27 +100,35 @@
         List<MonitorQualifyResult> results = mongoTemplate.find(query, MonitorQualifyResult.class);
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorQualify);
         calculator.calculate(results);
+        log.info("缁撴潫璁$畻涓�鏈轰竴妗e悎鏍肩巼");
     }
+
     public void platformOnlineTask() {
+        log.info("寮�濮嬭绠楀钩鍙板湪绾跨巼");
         //璁$畻骞冲彴鍦ㄧ嚎鐜�
         List<PlatformOnlineVO> list = platformOnlineMapper.yesterdayData(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_PlatformOnline);
         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(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
+                .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
         List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class);
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
         calculator.calculate(results);
+        log.info("缁撴潫璁$畻Osd鏍囨敞銆佹椂闂村噯纭巼");
     }
 
     /**
      * 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
      */
+    //鎵嬪姩鎵撳垎鍙栨渶杩戞暟鎹紝鍓嶇椤甸潰鍔犳墦鍒嗚鍒欐彁绀�
     @Transactional
     public void videoSecurity() {
         ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
@@ -138,14 +155,20 @@
                     count++;
                 }
             }
-            imageResourceSecurity.setWeakPassword(BigDecimal.valueOf(score));
+            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);
             // 鏇存柊鎸囨爣鏁版嵁
-            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