From 25163bd6852fdc8ace11fd5c3f60260b7e25798e Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 13 九月 2024 16:43:34 +0800
Subject: [PATCH] 异常恢复监控
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index 771bfc1..03aae29 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -28,10 +28,8 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.LocalDate;
+import java.util.*;
/**
* 璁惧璧勪骇Service涓氬姟灞傚鐞�
@@ -70,22 +68,21 @@
@Override
@DataScope(deptAlias = "d",userAlias = "u")
public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor) {
- List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
- // 寮傚父璁惧
+ // 寮傚父鎭㈠鐩戞帶
if (Objects.equals(tMonitor.getRecovery(), 1L)) {
String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
if (StringUtils.isBlank(time)) {
throw new RuntimeException("璇烽厤缃紓甯歌澶囪繛缁叧娉ㄦ椂闂�");
}
- List<TMonitorVO> recoveryMonitors = tMonitorMapper.selectRecoveryMonitor(time);
- monitors.addAll(recoveryMonitors);
+ tMonitor.setTime(time);
}
+ List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
// 瑙嗛鐩戞帶璁惧
if (Objects.equals(tMonitor.getCameraFunType(), "1")) {
monitors.forEach(monitor -> {
Query query = new Query();
query.addCriteria(Criteria.where("deviceId").is(monitor.getSerialNumber())
- // .and("mongoCreateTime").is(LocalDate.now())
+ .and("mongoCreateTime").is(LocalDate.now())
);
VideoOnlineResult one = mongoTemplate.findOne(query, VideoOnlineResult.class);
if (one != null) {
@@ -101,7 +98,7 @@
monitors.forEach(monitor -> {
Query query = new Query();
query.addCriteria(Criteria.where("externalIndexCode").is(monitor.getSerialNumber())
- // .and("mongoCreateTime").is(LocalDate.now())
+ .and("mongoCreateTime").is(LocalDate.now())
);
VehicleDeviceInspectionResult one = mongoTemplate.findOne(query, VehicleDeviceInspectionResult.class);
VehicleDeviceSamplingResult two = mongoTemplate.findOne(query, VehicleDeviceSamplingResult.class);
@@ -123,7 +120,7 @@
monitors.forEach(monitor -> {
Query query = new Query();
query.addCriteria(Criteria.where("externalIndexCode").is(monitor.getSerialNumber())
- // .and("mongoCreateTime").is(LocalDate.now())
+ .and("mongoCreateTime").is(LocalDate.now())
);
FaceDeviceInspectionResult one = mongoTemplate.findOne(query, FaceDeviceInspectionResult.class);
FaceDeviceSamplingResult two = mongoTemplate.findOne(query, FaceDeviceSamplingResult.class);
@@ -199,8 +196,8 @@
@Override
@DataScope(deptAlias = "d",userAlias = "u")
public Map<String, String> recoveryException(TMonitorVO monitor) {
- String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
- monitor.setTime(time);
+// String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
+// monitor.setTime(time);
return tMonitorMapper.recoveryException(monitor);
}
--
Gitblit v1.8.0