|
@@ -403,7 +403,7 @@ public class DataDashboardService {
|
|
|
// 品类查询
|
|
// 品类查询
|
|
|
List<ArticleCategory> categoryList = articleCategoryRepository.getByStatusAndVersion(ArticleCategoryStatusEnum.SUCCESS.getCode(), activeVersion);
|
|
List<ArticleCategory> categoryList = articleCategoryRepository.getByStatusAndVersion(ArticleCategoryStatusEnum.SUCCESS.getCode(), activeVersion);
|
|
|
Map<String, ArticleCategory> categoryMap = categoryList.stream()
|
|
Map<String, ArticleCategory> categoryMap = categoryList.stream()
|
|
|
- .collect(Collectors.toMap(ArticleCategory::getProduceContentId, Function.identity()));
|
|
|
|
|
|
|
+ .collect(Collectors.toMap(ArticleCategory::getProduceContentId, Function.identity(), (a, b) -> a));
|
|
|
Map<String, ArticleCategory> titleCategoryMap = categoryList.stream()
|
|
Map<String, ArticleCategory> titleCategoryMap = categoryList.stream()
|
|
|
.collect(Collectors.toMap(ArticleCategory::getTitleMd5, Function.identity(), (a, b) -> a));
|
|
.collect(Collectors.toMap(ArticleCategory::getTitleMd5, Function.identity(), (a, b) -> a));
|
|
|
log.info("newSortStrategyData categoryList finish");
|
|
log.info("newSortStrategyData categoryList finish");
|
|
@@ -1306,7 +1306,7 @@ public class DataDashboardService {
|
|
|
// 品类查询
|
|
// 品类查询
|
|
|
List<ArticleCategory> categoryList = articleCategoryRepository.getByStatusAndVersion(ArticleCategoryStatusEnum.SUCCESS.getCode(), activeVersion);
|
|
List<ArticleCategory> categoryList = articleCategoryRepository.getByStatusAndVersion(ArticleCategoryStatusEnum.SUCCESS.getCode(), activeVersion);
|
|
|
Map<String, ArticleCategory> categoryMap = categoryList.stream()
|
|
Map<String, ArticleCategory> categoryMap = categoryList.stream()
|
|
|
- .collect(Collectors.toMap(ArticleCategory::getProduceContentId, Function.identity()));
|
|
|
|
|
|
|
+ .collect(Collectors.toMap(ArticleCategory::getProduceContentId, Function.identity(), (a, b) -> a));
|
|
|
Map<String, ArticleCategory> titleCategoryMap = categoryList.stream()
|
|
Map<String, ArticleCategory> titleCategoryMap = categoryList.stream()
|
|
|
.collect(Collectors.toMap(ArticleCategory::getTitleMd5, Function.identity(), (a, b) -> a));
|
|
.collect(Collectors.toMap(ArticleCategory::getTitleMd5, Function.identity(), (a, b) -> a));
|
|
|
log.info("newSortStrategyFWHData categoryList finish");
|
|
log.info("newSortStrategyFWHData categoryList finish");
|
|
@@ -4183,7 +4183,7 @@ public class DataDashboardService {
|
|
|
List<ArticleCategory> articleCategoryList = articleCategoryRepository.getByStatusAndVersion(
|
|
List<ArticleCategory> articleCategoryList = articleCategoryRepository.getByStatusAndVersion(
|
|
|
ArticleCategoryStatusEnum.SUCCESS.getCode(), activeVersion);
|
|
ArticleCategoryStatusEnum.SUCCESS.getCode(), activeVersion);
|
|
|
Map<String, ArticleCategory> categoryMap = articleCategoryList.stream()
|
|
Map<String, ArticleCategory> categoryMap = articleCategoryList.stream()
|
|
|
- .collect(Collectors.toMap(ArticleCategory::getProduceContentId, Function.identity()));
|
|
|
|
|
|
|
+ .collect(Collectors.toMap(ArticleCategory::getProduceContentId, Function.identity(), (a, b) -> a));
|
|
|
Map<String, ArticleCategory> titleCategoryMap = articleCategoryList.stream()
|
|
Map<String, ArticleCategory> titleCategoryMap = articleCategoryList.stream()
|
|
|
.collect(Collectors.toMap(ArticleCategory::getTitleMd5, Function.identity(), (a, b) -> a));
|
|
.collect(Collectors.toMap(ArticleCategory::getTitleMd5, Function.identity(), (a, b) -> a));
|
|
|
Map<String, Map<String, CategoryGroupDataExport>> resultMap = new HashMap<>();
|
|
Map<String, Map<String, CategoryGroupDataExport>> resultMap = new HashMap<>();
|