From a56cbc8a929232b039f137fc51b5af27f40b2822 Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期四, 01 八月 2024 15:33:25 +0800 Subject: [PATCH] feat:异常恢复监控 --- ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 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 57e65f8..4a241b1 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 @@ -6,11 +6,14 @@ import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.service.ITMonitorService; +import com.ycl.system.service.ISysConfigService; +import com.ycl.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; +import java.util.Objects; /** * 璁惧璧勪骇Service涓氬姟灞傚鐞� @@ -23,6 +26,8 @@ { @Autowired private TMonitorMapper tMonitorMapper; + @Autowired + private ISysConfigService configService; /** * 鏌ヨ璁惧璧勪骇 @@ -46,7 +51,16 @@ @DataScope(deptAlias = "d",userAlias = "u") public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor) { - return tMonitorMapper.selectTMonitorList(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); + } + return monitors; } /** @@ -105,6 +119,7 @@ @Override public Map<String, String> recoveryException() { - return tMonitorMapper.recoveryException(); + String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time"); + return tMonitorMapper.recoveryException(time); } } -- Gitblit v1.8.0