Skip to content

Commit

Permalink
fix: the issue of storing pagination list queries is fixed (apache#455)
Browse files Browse the repository at this point in the history
  • Loading branch information
@wtt40122
wtt40122 committed Sep 11, 2024
1 parent c0fe67e commit 77d82a9
Showing 1 changed file with 21 additions and 26 deletions.
47 changes: 21 additions & 26 deletions .../main/java/com/xiaomi/mone/log/manager/service/impl/MilogMiddlewareConfigServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
package com.xiaomi.mone.log.manager.service.impl;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDto;
import com.google.common.collect.Lists;
import com.xiaomi.mone.log.api.enums.*;
import com.xiaomi.mone.log.api.model.bo.MiLogResource;
Expand Down Expand Up @@ -71,7 +71,7 @@
import java.util.stream.Collectors;

import static com.xiaomi.mone.log.common.Constant.*;
import static com.xiaomi.mone.log.manager.common.ManagerConstant.*;
import static com.xiaomi.mone.log.manager.common.ManagerConstant.RESOURCE_NOT_INITIALIZED_MESSAGE;

/**
* @author wtt
Expand Down Expand Up @@ -220,7 +220,6 @@ public PageInfo<ResourceInfo> queryResourceWithTab(ResourcePage resourcePage) {

Long esResourceTotal = queryStorageResource(pageList, resourcePage);

pageList = resourceExtensionService.userShowAuthority(pageList);
List<ResourceInfo> resourceInfos = pageList.stream().map(MilogMiddlewareConfig::configToResourceVO).collect(Collectors.toList());

return new PageInfo(resourcePage.getPage(), resourcePage.getPageSize(), mqResourceTotal + esResourceTotal.intValue(), resourceInfos);
Expand Down Expand Up @@ -249,14 +248,14 @@ private Cnd buildMqQueryCnd(ResourcePage resourcePage) {
private Long queryStorageResource(List<MilogMiddlewareConfig> milogMiddlewareConfigs, ResourcePage resourcePage) {
Integer count = 0;
if (Objects.equals(ResourceEnum.STORAGE.getCode(), resourcePage.getResourceCode())) {
PageDto page = new PageDto<MilogEsClusterDO>(resourcePage.getPage(), resourcePage.getPageSize());
Wrapper queryWrapper = generateEsQueryWrapper(resourcePage);

PageDto<MilogEsClusterDO> esClusterPage = milogEsClusterMapper.selectPage(page, queryWrapper);
List<MilogMiddlewareConfig> configEsList = esClusterPage.getRecords().stream().map(MilogEsClusterDO::miLogEsResourceToConfig).toList();
milogMiddlewareConfigs.addAll(configEsList);
List<MilogEsClusterDO> clusterDOList = milogEsClusterMapper.selectList(generateEsQueryWrapper(resourcePage));
List<MilogMiddlewareConfig> configEsList = clusterDOList.stream().map(MilogEsClusterDO::miLogEsResourceToConfig).toList();
configEsList = resourceExtensionService.userShowAuthority(configEsList);
List<MilogMiddlewareConfig> pageList = CollectionUtil.page(resourcePage.getPage() - 1, resourcePage.getPageSize(), configEsList);
milogMiddlewareConfigs.addAll(pageList);

count = milogEsClusterMapper.selectCount(queryWrapper);
count = configEsList.size();
}
return count.longValue();
}
Expand Down Expand Up @@ -311,10 +310,10 @@ private void checkEsAddressPortOperate(MiLogResource miLogResource) {
if (index == -1) {
serviceUrl = String.format("%s:%s", serviceUrl, "80");
} else {
String portStr = serviceUrl.substring(index + 1);
if (StringUtils.isBlank(portStr)) {
serviceUrl = String.format("%s%s", serviceUrl, "80");
}
String portStr = serviceUrl.substring(index + 1);
if (StringUtils.isBlank(portStr)) {
serviceUrl = String.format("%s%s", serviceUrl, "80");
}
}
miLogResource.setServiceUrl(serviceUrl);
}
Expand Down Expand Up @@ -346,9 +345,7 @@ private void synchronousMqResourceLabel(Long id) {
if (CollectionUtils.isEmpty(milogMiddlewareConfigs)) {
milogMiddlewareConfigs = milogMiddlewareConfigDao.queryAll();
}
milogMiddlewareConfigs.forEach(milogMiddlewareConfig -> {
updateMqResourceLabel(milogMiddlewareConfig);
});
milogMiddlewareConfigs.forEach(this::updateMqResourceLabel);
}

private void synchronousEsResourceLabel(Long id) {
Expand All @@ -359,9 +356,7 @@ private void synchronousEsResourceLabel(Long id) {
if (CollectionUtils.isEmpty(esClusterDOS)) {
esClusterDOS = milogEsClusterMapper.selectList(new QueryWrapper<>());
}
esClusterDOS.forEach(clusterDO -> {
updateEsResourceLabel(clusterDO);
});
esClusterDOS.forEach(this::updateEsResourceLabel);
}

/**
Expand Down Expand Up @@ -524,7 +519,7 @@ private void updateMqResourceLabel(MilogMiddlewareConfig milogMiddlewareConfig)
if (Constant.DEFAULT_OPERATOR.equals(milogMiddlewareConfig.getUpdater())) {
return;
}
List<String> newLabels = generateResourceLabels(milogMiddlewareConfig.getUpdater(), labels);
List<String> newLabels = mergeUserAndResourceLabels(milogMiddlewareConfig.getCreator(), milogMiddlewareConfig.getUpdater(), labels);
milogMiddlewareConfig.setLabels(newLabels);
milogMiddlewareConfigDao.updateMiddlewareConfig(milogMiddlewareConfig);
}
Expand All @@ -534,18 +529,18 @@ private void updateEsResourceLabel(MilogEsClusterDO clusterDO) {
if (StringUtils.isBlank(clusterDO.getUpdater()) && StringUtils.isBlank(clusterDO.getCreator())) {
return;
}
List<String> newLabels = generateResourceLabels(StringUtils.isBlank(clusterDO.getUpdater()) ? clusterDO.getCreator() : clusterDO.getUpdater(), labels);
List<String> newLabels = mergeUserAndResourceLabels(clusterDO.getCreator(), StringUtils.isBlank(clusterDO.getUpdater()) ? clusterDO.getCreator() : clusterDO.getUpdater(), labels);
clusterDO.setLabels(newLabels);
milogEsClusterMapper.updateById(clusterDO);
}

private List<String> generateResourceLabels(String updaterUId, List<String> existLabels) {
private List<String> mergeUserAndResourceLabels(String creatorUId, String updaterUId, List<String> existLabels) {
List<String> resourceDeptLabels = resourceExtensionService.generateResourceLabels(updaterUId);
if (CollectionUtils.isNotEmpty(existLabels)) {
List<String> userLabelList = existLabels.stream().filter(label -> !label.startsWith(DEPT_LEVEL_PREFIX) || !label.contains(DEPT_NAME_PREFIX)).collect(Collectors.toList());
resourceDeptLabels.addAll(userLabelList);
if (!Objects.equals(creatorUId, updaterUId) &&
CollectionUtils.isNotEmpty(existLabels) && !CollUtil.containsAll(existLabels, resourceDeptLabels)) {
existLabels.addAll(resourceDeptLabels);
}
return resourceDeptLabels;
return existLabels;
}

/**
Expand Down

0 comments on commit 77d82a9

Please sign in to comment.