diff --git a/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java b/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java index ac89899..7f2cd32 100644 --- a/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java +++ b/src/main/java/org/springblade/modules/monitor/service/impl/ConfigMonitorServiceImpl.java @@ -224,50 +224,12 @@ public class ConfigMonitorServiceImpl extends ServiceImpl getServiceList() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ConfigMonitor::getType,MonitorConstant.SERVICE); - List list = baseMapper.selectList(wrapper); - return list; - } - - @Override - public List getMiddleList() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ConfigMonitor::getType,MonitorConstant.REDIS).or().eq(ConfigMonitor::getType,MonitorConstant.MYSQL); - List list = baseMapper.selectList(wrapper); - return list; - } - - @Override - public List getServerParamsList() { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(ConfigMonitor::getType,MonitorConstant.WEB); - List list = baseMapper.selectList(wrapper); - return list; - } - - public List getParentIdList(List parentIdList,Long parentId){ - parentIdList.add(parentId); - if(parentId != 0){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(ConfigMonitor::getId,parentId); - queryWrapper.eq(BaseEntity::getIsDeleted,0); - ConfigMonitor configMonitor = baseMapper.selectOne(queryWrapper); - parentId = configMonitor.getParentId(); - //服务器不需要排查,所以只需要到服务层面就可以 - if(configMonitor.getType().equals(MonitorConstant.SERVICE)){ - return parentIdList; - } - getParentIdList(parentIdList,parentId); - } - return parentIdList; - } @Override public Object getWarnLinePoint(String parentId) { // 先查询该微服务 List resultList = new ArrayList(); ConfigMonitor monitor = baseMapper.selectOne(Wrappers.lambdaQuery().eq(ConfigMonitor::getId, parentId)); + if (monitor == null) { return resultList; } @@ -334,7 +296,31 @@ public class ConfigMonitorServiceImpl extends ServiceImpl getParentIdList(List parentIdList, Long parentId) { + @Override + public List getServiceList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ConfigMonitor::getType, MonitorConstant.SERVICE); + List list = baseMapper.selectList(wrapper); + return list; + } + + @Override + public List getMiddleList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ConfigMonitor::getType, MonitorConstant.REDIS).or().eq(ConfigMonitor::getType, MonitorConstant.MYSQL); + List list = baseMapper.selectList(wrapper); + return list; + } + + @Override + public List getServerParamsList() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ConfigMonitor::getType, MonitorConstant.WEB); + List list = baseMapper.selectList(wrapper); + return list; + } + + public List getParentIdList(List parentIdList, Long parentId) { parentIdList.add(parentId); if (parentId != 0) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();