From 1ae3f059e27fcfa6f1b46a9d36b0be1efa0e3172 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 13 八月 2024 14:41:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 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 88610bb..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,21 @@
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;
@@ -28,6 +35,8 @@
private TMonitorMapper tMonitorMapper;
@Autowired
private ISysConfigService configService;
+ @Autowired
+ private RedisCache redisCache;
/**
* 鏌ヨ璁惧璧勪骇
@@ -49,7 +58,7 @@
*/
@Override
@DataScope(deptAlias = "d",userAlias = "u")
- public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
+ public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor)
{
List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
if (Objects.equals(tMonitor.getRecovery(), 1)) {
@@ -122,4 +131,33 @@
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