From fa12bf28a088fe8cc82868fab9a9d689252108a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 06 八月 2024 15:28:10 +0800
Subject: [PATCH] Monitor结构更新2
---
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 25 +++++++++++++++++++++++--
1 files changed, 23 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 4a241b1..57ea6e8 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,17 @@
import annotation.DataScope;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.query.HomeQuery;
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.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;
@@ -49,10 +52,10 @@
*/
@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(), 1L)) {
+ if (Objects.equals(tMonitor.getRecovery(), 1)) {
String time = configService.selectConfigByKey("abnormal.equipment.continuous.attention.time");
if (StringUtils.isBlank(time)) {
throw new RuntimeException("璇烽厤缃紓甯歌澶囪繛缁叧娉ㄦ椂闂�");
@@ -122,4 +125,22 @@
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;
+ }
}
--
Gitblit v1.8.0