From d1883c9da86e3e36e0c997554ad79b44a8f35494 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 01 八月 2024 18:05:13 +0800
Subject: [PATCH] 数据上传及时性

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |   53 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 11 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 32d6e38..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
@@ -1,28 +1,37 @@
 package com.ycl.platform.service.impl;
 
-import com.ycl.platform.entity.TMonitor;
+import annotation.DataScope;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.platform.domain.entity.TMonitor;
+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涓氬姟灞傚鐞�
- * 
+ *
  * @author ruoyi
  * @date 2024-03-04
  */
 @Service
-public class TMonitorServiceImpl implements ITMonitorService
+public class TMonitorServiceImpl extends ServiceImpl<TMonitorMapper, TMonitor> implements ITMonitorService
 {
     @Autowired
     private TMonitorMapper tMonitorMapper;
+    @Autowired
+    private ISysConfigService configService;
 
     /**
      * 鏌ヨ璁惧璧勪骇
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 璁惧璧勪骇
      */
@@ -34,19 +43,29 @@
 
     /**
      * 鏌ヨ璁惧璧勪骇鍒楄〃
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 璁惧璧勪骇
      */
     @Override
-    public List<TMonitor> selectTMonitorList(TMonitor tMonitor)
+    @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;
     }
 
     /**
      * 鏂板璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -58,7 +77,7 @@
 
     /**
      * 淇敼璁惧璧勪骇
-     * 
+     *
      * @param tMonitor 璁惧璧勪骇
      * @return 缁撴灉
      */
@@ -70,7 +89,7 @@
 
     /**
      * 鎵归噺鍒犻櫎璁惧璧勪骇
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑璁惧璧勪骇涓婚敭
      * @return 缁撴灉
      */
@@ -82,7 +101,7 @@
 
     /**
      * 鍒犻櫎璁惧璧勪骇淇℃伅
-     * 
+     *
      * @param id 璁惧璧勪骇涓婚敭
      * @return 缁撴灉
      */
@@ -91,4 +110,16 @@
     {
         return tMonitorMapper.deleteTMonitorById(id);
     }
+
+    @Override
+    @DataScope(deptAlias = "d",userAlias = "u")
+    public Map<String, String> getVideoCount(TMonitor tMonitor) {
+        return tMonitorMapper.getVideoCount(tMonitor);
+    }
+
+    @Override
+    public Map<String, String> recoveryException() {
+        String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
+        return tMonitorMapper.recoveryException(time);
+    }
 }

--
Gitblit v1.8.0