From 3364d6efd58eca1d6acf129948265b1e663dae7a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 13:38:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/task/VideoTask.java |   23 +++++++++++++++++++----
 1 files changed, 19 insertions(+), 4 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 7b0f7ec..4dc6072 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -7,11 +7,14 @@
 import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
 import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
+import com.ycl.platform.domain.result.UY.PyOsdResult;
 import com.ycl.platform.domain.result.UY.QueryVqdResult;
 import com.ycl.platform.domain.result.UY.VideoOnlineResult;
 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.PlatformOnlineMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.PlatformOnlineService;
 import com.ycl.system.mapper.SysDeptMapper;
 import com.ycl.utils.DateUtils;
@@ -43,7 +46,8 @@
     private MongoTemplate mongoTemplate;
     @Autowired
     private PlatformOnlineMapper platformOnlineMapper;
-
+    @Autowired
+    private TMonitorMapper monitorMapper;
 
     public void siteOnlineTask() {
         Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -71,7 +75,9 @@
 
     public void oneMonitorFileTask() {
         //璁$畻涓�鏈轰竴妗f敞鍐岀巼銆佹。妗堣�冩牳姣�
-
+        List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
+        CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
+        calculator.calculate(tMonitorVOS);
     }
 
     public void oneMonitorQualifyTask(){
@@ -86,10 +92,19 @@
     }
     public void platformOnlineTask() {
         //璁$畻骞冲彴鍦ㄧ嚎鐜�
-        List<PlatformOnlineVO> list = platformOnlineMapper.sumYesterday(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
+        List<PlatformOnlineVO> list = platformOnlineMapper.yesterdayData(DateUtils.getMouthStart(new Date()), DateUtils.getMouthEnd(new Date()));
         CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_PlatformOnline);
         calculator.calculate(list);
     }
-
+    public void osdTask() {
+        //璁$畻Osd鏍囨敞銆佹椂闂村噯纭巼
+        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<PyOsdResult> results = mongoTemplate.find(query, PyOsdResult.class);
+        CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
+        calculator.calculate(results);
+    }
 
 }

--
Gitblit v1.8.0