From 3bd5f68b6db251dfa9bf377758faa6315b3a372d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:11:50 +0800
Subject: [PATCH] 人脸合格、图片可用
---
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..88610bb 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(), 1)) {
+ 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