From ab744742edfd1b402dbbe326acba110db8d0b8ac Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 19:49:31 +0800
Subject: [PATCH] 考核bug修复、详情页加切换
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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 a5d1da3..6443d2f 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -9,10 +9,7 @@
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.ImageResourceSecurityDetailMapper;
-import com.ycl.platform.mapper.PlatformOnlineMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.*;
import com.ycl.platform.service.IImageResourceSecurityService;
import com.ycl.utils.DateUtils;
import com.ycl.utils.DictUtils;
@@ -51,6 +48,8 @@
private final IImageResourceSecurityService imageResourceSecurityService;
private final CheckIndexVideoMapper checkIndexVideoMapper;
private final ImageResourceSecurityDetailMapper imageResourceSecurityDetailMapper;
+ private final ImageResourceSecurityMapper imageResourceSecurityMapper;
+
private static final BigDecimal NUM = new BigDecimal("0.15");
public void siteOnlineTask() {
@@ -115,7 +114,8 @@
public void osdTask() {
log.info("寮�濮嬭绠桹sd鏍囨敞銆佹椂闂村噯纭巼");
//璁＄畻Osd鏍囨敞銆佹椂闂村噯纭巼
-// Date yesterday = DateUtils.addDays(new Date(), -1);
+ //TODO娴嬭瘯鏀逛负浠婂ぉ
+ Date yesterday = DateUtils.addDays(new Date(), -1);
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
@@ -128,7 +128,6 @@
/**
* 瑙嗛鍥惧儚璧勬簮瀹夊叏锛岄渶瑕佹帓鍦ㄥ钩鍙板湪绾跨巼鍚庨潰銆�
*/
- //鎵嬪姩鎵撳垎鍙栨渶杩戞暟鎹紝鍓嶇椤甸潰鍔犳墦鍒嗚鍒欐彁绀�
@Transactional
public void videoSecurity() {
ArrayList<ImageResourceSecurity> imageResourceSecurities = new ArrayList<>();
@@ -161,6 +160,9 @@
imageResourceSecurity.setRiskProperty(BigDecimal.valueOf(count / onlineAssetsTotal));
imageResourceSecurity.setCreateTime(DateUtils.getNowDate());
imageResourceSecurities.add(imageResourceSecurity);
+ //鑾峰彇鏈�杩戜竴娆℃暟鎹墜鍔ㄦ墦鍒�
+ ImageResourceSecurity latest = imageResourceSecurityMapper.getLatest(checkIndexVideo.getDeptId(),new Date());
+ imageResourceSecurity.setBoundaryIntegrity(latest.getBoundaryIntegrity());
// 鏇存柊鎸囨爣鏁版嵁
checkIndexVideo.setImageResourceSecurity(
imageResourceSecurity.getPlatformOnline()
--
Gitblit v1.8.0