From 4d25380fe077f82b45f00e83ecb6d93e76c95554 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 29 八月 2024 16:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 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 522d096..3aa39a4 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -3,34 +3,22 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
-import com.ycl.platform.domain.entity.CheckIndexVideo;
-import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
-import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
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.PlatformOnlineMapper;
import com.ycl.platform.mapper.TMonitorMapper;
-import com.ycl.platform.service.PlatformOnlineService;
-import com.ycl.system.mapper.SysDeptMapper;
import com.ycl.utils.DateUtils;
-import constant.ApiConstants;
import constant.CalculationStrategyConstants;
-import constant.CheckConstants;
-import enumeration.general.AreaDeptEnum;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 瑙嗛璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -48,12 +36,10 @@
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
- //TODO:鏃堕棿鍐欐浜�
- Date date = DateUtils.getDay(2024,7,13);
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰閲嶇偣鐐逛綅鍦ㄧ嚎鐜囧拰鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
@@ -62,12 +48,10 @@
public void videoUsabilityTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
- //TODO:鏃堕棿鍐欐浜�
- Date date = DateUtils.getDay(2024,7,13);
//璁＄畻褰曞儚鍙敤鐜囧拰閲嶇偣褰曞儚鍙敤鐜�
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
@@ -82,12 +66,11 @@
}
public void oneMonitorQualifyTask(){
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
-// Date yesterday = DateUtils.addDays(new Date(), -1);
- //TODO:鏃堕棿鍐欐浜�
- Date date = DateUtils.getDay(2024,7,13);
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
List<MonitorQualifyResult> results = mongoTemplate.find(query, MonitorQualifyResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorQualify);
calculator.calculate(results);
@@ -101,12 +84,10 @@
public void osdTask() {
//璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼
Date yesterday = DateUtils.addDays(new Date(), -1);
- //TODO:鏃堕棿鍐欐浜�
- Date date = DateUtils.getDay(2024,7,13);
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(date)).lt(DateUtils.getDayEnd(date)));
- List<PyOsdResult> results = mongoTemplate.find(query, PyOsdResult.class);
+ .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);
}
--
Gitblit v1.8.0