From 10f65333417f064377b01a89064d2ce716603a07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 20:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 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 1d212aa..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,37 +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.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.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;
/**
* 瑙嗛璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -68,7 +53,7 @@
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
- List<RecordMetaDSumParam> results = mongoTemplate.find(query, RecordMetaDSumParam.class);
+ List<RecordMetaDSumResult> results = mongoTemplate.find(query, RecordMetaDSumResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
calculator.calculate(results);
}
@@ -76,17 +61,16 @@
public void oneMonitorFileTask() {
//璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
- CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_Usability);
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate);
calculator.calculate(tMonitorVOS);
}
- //TODO:鏃堕棿鍐欐浜�
public void oneMonitorQualifyTask(){
//璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
-// Date yesterday = DateUtils.addDays(new Date(), -1);
- 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);
@@ -103,7 +87,7 @@
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);
+ List<OsdCheckResult> results = mongoTemplate.find(query, OsdCheckResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_OsdTime);
calculator.calculate(results);
}
--
Gitblit v1.8.0