Commit 75054cf3 authored by yangyw's avatar yangyw

feature: 过滤资料库分类

parent 3fe03f77
......@@ -37,6 +37,7 @@ import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.reactive.function.client.WebClient;
import org.xbill.DNS.InvalidTTLException;
import reactor.core.publisher.Flux;
import java.math.BigDecimal;
......@@ -909,18 +910,36 @@ public class AppExamineService {
return pageResult;
}
private List<Integer> findLevelOneCategory(List<Integer> categoryIdList) {
Set<Integer> levelOneCategorySet = new HashSet<>();
WikiCategoryRequestModel cr = new WikiCategoryRequestModel();
List<WikiCategoryResponseModel> items = examineService.wikiCategoryList(cr);
Map<Integer, WikiCategoryResponseModel> map = items.stream().collect(Collectors.toMap(WikiCategoryResponseModel::getId, v -> v));
for(Integer id : categoryIdList) {
WikiCategoryResponseModel model = map.get(id);
if(Objects.nonNull(model)) {
if (model.getParentId() == 0) {
levelOneCategorySet.add(id);
} else {
levelOneCategorySet.add(model.getParentId());
}
}
}
return Lists.newArrayList(levelOneCategorySet);
}
/**
* 资料库分类分页查询
* @param request
* @return
*/
public PageResult<WikiCategoryMobileDto> wikiCategoryMobilePaginQuery(WikiCategoryRequestDto request) {
WikiCategoryRequestModel requestModel = BeanUtil.copyProperties(request, WikiCategoryRequestModel.class);
requestModel.setStatus(1);
requestModel.setPageSize(1000);
List<Integer> categoryIdList = examineService.wikiCategoryUseableList();
requestModel.setIdList(categoryIdList);
requestModel.setIdList(findLevelOneCategory(categoryIdList));
Page<WikiCategoryResponseModel> page = examineService.wikiCategoryPaginQuery(requestModel);
PageResult<WikiCategoryMobileDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
if(CollectionUtil.isNotEmpty(page.getRecords())) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment