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/FaceTask.java | 45 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/FaceTask.java b/ycl-server/src/main/java/com/ycl/task/FaceTask.java
index f258b5a..3d7cfc3 100644
--- a/ycl-server/src/main/java/com/ycl/task/FaceTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java
@@ -3,13 +3,13 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
-import com.ycl.platform.domain.result.HK.CrossDetailResult;
-import com.ycl.platform.domain.result.HK.MonitoringDetailResult;
-import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult;
+import com.ycl.platform.domain.result.HK.*;
+import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import constant.CalculationStrategyConstants;
+import constant.CheckConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -19,6 +19,7 @@
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 浜鸿劯璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -29,6 +30,8 @@
public class FaceTask {
@Autowired
private MongoTemplate mongoTemplate;
+ @Autowired
+ private TMonitorMapper monitorMapper;
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -41,9 +44,19 @@
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_SiteOnline_ViewStability);
calculator.calculate(results);
}
- public void InfoAccuracyTask(){
+ public void deviceSampleTask() {
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<FaceDeviceSamplingResult> results = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_DataAccuracy_PicUsability);
+ calculator.calculate(results);
+ }
+ public void infoAccuracyTask(){
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ //璁＄畻浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
@@ -53,7 +66,7 @@
}
public void snapShopDelay(){
Date yesterday = DateUtils.addDays(new Date(), -1);
- //璁＄畻杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
+ //璁＄畻浜鸿劯鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))
@@ -62,4 +75,22 @@
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_SnapshotDelay);
calculator.calculate(results);
}
+ public void clockAccuracyTask() {
+ 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<FaceDeviceInspectionResult> results = mongoTemplate.find(query, FaceDeviceInspectionResult.class);
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_ClockAccuracy);
+ calculator.calculate(results);
+ }
+
+ public void directConsistentTask() {
+ //浜鸿劯鐩綍涓�鑷寸巼
+ List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
+ List<TMonitorVO> list = tMonitorVOS.stream().filter(tMonitorVO -> tMonitorVO.getCameraFunType().contains(CheckConstants.Rule_Category_Face + "")).collect(Collectors.toList());
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_DirectConsistent);
+ calculator.calculate(list);
+ }
}
--
Gitblit v1.8.0