From e32fc76d4159be3e9a6fc37f64d84c5942abe136 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 13 八月 2024 09:48:13 +0800
Subject: [PATCH] 空单生成空指针异常处理

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 3 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..9aa15a8 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
@@ -3,14 +3,24 @@
 import annotation.DataScope;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.DashboardQuery;
+import com.ycl.platform.domain.query.HomeQuery;
 import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.vo.screen.MonitorRateVO;
+import com.ycl.platform.domain.vo.screen.MonitorTotalVO;
 import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ITMonitorService;
+import com.ycl.system.service.ISysConfigService;
+import com.ycl.utils.StringUtils;
+import com.ycl.utils.redis.RedisCache;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * 璁惧璧勪骇Service涓氬姟灞傚鐞�
@@ -23,6 +33,10 @@
 {
     @Autowired
     private TMonitorMapper tMonitorMapper;
+    @Autowired
+    private ISysConfigService configService;
+    @Autowired
+    private RedisCache redisCache;
 
     /**
      * 鏌ヨ璁惧璧勪骇
@@ -44,9 +58,18 @@
      */
     @Override
     @DataScope(deptAlias = "d",userAlias = "u")
-    public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
+    public List<TMonitorVO> selectTMonitorList(TMonitorVO 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 +128,36 @@
 
     @Override
     public Map<String, String> recoveryException() {
-        return tMonitorMapper.recoveryException();
+        String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
+        return tMonitorMapper.recoveryException(time);
+    }
+
+    @Override
+    public Map<String, Object> home(HomeQuery monitorQuery) {
+        Map<String, Object> dataMap = new HashMap<>();
+        Map<String, Object> monthMap1 = new HashMap<>();
+        Map<String, Object> monthMap2 = new HashMap<>();
+        List<Map<String, Object>> home = baseMapper.home(monitorQuery);
+        if (ObjectUtils.isNotEmpty(home)) {
+            for (Map<String, Object> map : home) {
+                monthMap1.put(map.get("months").toString(), map.get("num1"));
+                monthMap2.put(map.get("months").toString(), map.get("num2"));
+            }
+            dataMap.put("name", home.get(0).get("name"));
+            dataMap.put("state", monthMap1);
+            dataMap.put("state2", monthMap2);
+        }
+        return dataMap;
+    }
+
+    @Override
+    public List<MonitorTotalVO> monitorTotal(DashboardQuery dashboardQuery) {
+        List<MonitorTotalVO> list = baseMapper.monitorTotal(dashboardQuery);
+        return list;
+    }
+
+    @Override
+    public List<MonitorRateVO> monitorRate(DashboardQuery dashboardQuery) {
+        return baseMapper.monitorRate(dashboardQuery);
     }
 }

--
Gitblit v1.8.0