From 9b55891e6dd57bc244e6c5654434b32e05c83496 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:10:25 +0800
Subject: [PATCH] 异常监控排除已经审核过的工单作为状态
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 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 3a277bd..cd921d7 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -6,6 +6,8 @@
import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.entity.ImageResourceSecurity;
import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
+import com.ycl.platform.domain.form.VideoExportForm;
+import com.ycl.platform.domain.result.SYS.TMonitorResult;
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.domain.vo.PlatformOnlineVO;
import com.ycl.platform.domain.vo.TMonitorVO;
@@ -13,7 +15,9 @@
import com.ycl.platform.service.IImageResourceSecurityService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.DictUtils;
+import constant.ApiConstants;
import constant.CalculationStrategyConstants;
+import constant.CheckConstants;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -54,15 +58,11 @@
public void siteOnlineTask() {
log.info("寮�濮嬭绠楃偣浣嶅湪绾跨巼");
- 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<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
+ VideoExportForm form = new VideoExportForm();
+ form.setCameraFunType(Integer.valueOf(CheckConstants.Rule_Category_Video+""));
+ List<TMonitorResult> tMonitorResults = monitorMapper.selectMonitorResult(form);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_SiteOnline);
- calculator.calculate(results);
+ calculator.calculate(tMonitorResults);
log.info("缁撴潫璁＄畻鐐逛綅鍦ㄧ嚎鐜�");
}
@@ -83,9 +83,13 @@
public void oneMonitorFileTask() {
log.info("寮�濮嬭绠椾竴鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
//璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
- List<TMonitorVO> tMonitorVOS = monitorMapper.selectMonitorVOList();
+ 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<MonitorQualifyResult> results = mongoTemplate.find(query, MonitorQualifyResult.class);
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate);
- calculator.calculate(tMonitorVOS);
+ calculator.calculate(results);
log.info("缁撴潫璁＄畻涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�");
}
@@ -127,7 +131,7 @@
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
*/
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void videoSecurity() {
ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
List<CheckIndexVideo> list = checkIndexVideoMapper.selectAndDeptName();
--
Gitblit v1.8.0