From 17244068535a9163ab1fd6b3be2a794d9a857879 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 15 八月 2024 17:48:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/task/CarTask.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/task/CarTask.java b/ycl-server/src/main/java/com/ycl/task/CarTask.java
index 66e5257..fd36a2a 100644
--- a/ycl-server/src/main/java/com/ycl/task/CarTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java
@@ -4,9 +4,12 @@
import com.ycl.calculate.CalculationStrategy;
import com.ycl.factory.IndexCalculationFactory;
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;
@@ -16,6 +19,7 @@
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 杞﹁締璁＄畻鑰冩牳鎸囨爣浠诲姟
@@ -26,7 +30,8 @@
public class CarTask {
@Autowired
private MongoTemplate mongoTemplate;
-
+ @Autowired
+ private TMonitorMapper monitorMapper;
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
@@ -95,8 +100,12 @@
calculator.calculate(results);
}
- public void test() {
- Date yesterday = DateUtils.addDays(new Date(), -1);
- //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼
+ public void directConsistentTask() {
+ //杞﹁締鐩綍涓�鑷寸巼
+ List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
+ List<TMonitorVO> list = tMonitorVOS.stream().filter(tMonitorVO -> tMonitorVO.getCameraFunType().contains(CheckConstants.Rule_Category_Car + "")).collect(Collectors.toList());
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_DirectConsistent);
+ calculator.calculate(list);
}
+
}
--
Gitblit v1.8.0