From b04753affc29f1042d0eb75b0af87824a0f4a8aa Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 09 八月 2024 15:41:48 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 91 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 80 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..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 @@ -1,28 +1,46 @@ 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.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涓氬姟灞傚鐞� - * + * * @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; + @Autowired + private RedisCache redisCache; /** * 鏌ヨ璁惧璧勪骇 - * + * * @param id 璁惧璧勪骇涓婚敭 * @return 璁惧璧勪骇 */ @@ -34,19 +52,29 @@ /** * 鏌ヨ璁惧璧勪骇鍒楄〃 - * + * * @param tMonitor 璁惧璧勪骇 * @return 璁惧璧勪骇 */ @Override - public List<TMonitor> selectTMonitorList(TMonitor tMonitor) + @DataScope(deptAlias = "d",userAlias = "u") + 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; } /** * 鏂板璁惧璧勪骇 - * + * * @param tMonitor 璁惧璧勪骇 * @return 缁撴灉 */ @@ -58,7 +86,7 @@ /** * 淇敼璁惧璧勪骇 - * + * * @param tMonitor 璁惧璧勪骇 * @return 缁撴灉 */ @@ -70,7 +98,7 @@ /** * 鎵归噺鍒犻櫎璁惧璧勪骇 - * + * * @param ids 闇�瑕佸垹闄ょ殑璁惧璧勪骇涓婚敭 * @return 缁撴灉 */ @@ -82,7 +110,7 @@ /** * 鍒犻櫎璁惧璧勪骇淇℃伅 - * + * * @param id 璁惧璧勪骇涓婚敭 * @return 缁撴灉 */ @@ -91,4 +119,45 @@ { 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); + } + + @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