feat(catalog): 新增分类推荐榜快照接口
backend-ci / test (push) Failing after 4m45s

This commit is contained in:
Zhou Weidong committed 2026-11-02 14:45:43 +08:00
1 parent afd8d00752
commit 8a5a381b44
23 files changed
+793 -16

No files matched your search

@@ -3,11 +3,13 @@
package com.fruitshorts.app.controller;
import com.fruitshorts.app.service.AppCatalogService;
import com.fruitshorts.app.service.AppRankingService;
import com.fruitshorts.app.vo.AppCategoryVO;
import com.fruitshorts.app.vo.AppDramaPageReqVO;
import com.fruitshorts.app.vo.AppFeedVO;
import com.fruitshorts.app.vo.AppDramaCardVO;
import com.fruitshorts.app.vo.AppPlaylistDetailVO;
import com.fruitshorts.app.vo.AppRankingVO;
import com.fruitshorts.common.pojo.CursorResult;
import com.fruitshorts.common.pojo.PageResult;
import com.fruitshorts.common.pojo.Result;
@@ -37,6 +39,7 @@ public class AppCatalogController {
private static final int DRAMA_PAGE_SIZE = 20;
private final AppCatalogService appCatalogService;
private final AppRankingService appRankingService;
@Operation(summary = "首页聚合:轮播 + 分区,一次请求渲染整页")
@GetMapping("/home/feed")
@@ -75,6 +78,12 @@ public class AppCatalogController {
return Result.ok(appCatalogService.categoryDramas(id, pageIndex, pageSize));
}
@Operation(summary = "推荐榜:按后台配置顺序返回榜单快照")
@GetMapping("/categories/{id}/ranking")
public Result<AppRankingVO> categoryRanking(@PathVariable Long id) {
return Result.ok(appRankingService.ranking(id));
}
@Operation(summary = "已启用类型")
@GetMapping("/drama-categories")
public Result<List<AppCategoryVO>> dramaCategories() {
@@ -92,6 +92,11 @@ public class AppCatalogService {
c.getNameLocales(), c.getName(), c.getNameEn(), c.getNameId());
AppCategoryVO vo = new AppCategoryVO(c.getId(), ContentLocaleTexts.value(locales, ContentLocaleTexts.ZH));
vo.setLocales(locales);
vo.setCode(c.getCode());
vo.setLayoutType(c.getLayoutType() == null
? DramaClassificationService.LAYOUT_GRID
: c.getLayoutType());
vo.setRevision(c.getRevision() == null ? 1L : c.getRevision());
return vo;
})
.toList();
@@ -0,0 +1,79 @@
// Author: fruit.com.cn
package com.fruitshorts.app.service;
import com.fruitshorts.app.vo.AppDramaCardVO;
import com.fruitshorts.app.vo.AppRankingEntryVO;
import com.fruitshorts.app.vo.AppRankingVO;
import com.fruitshorts.common.exception.ErrorCode;
import com.fruitshorts.common.exception.ServiceException;
import com.fruitshorts.content.dal.entity.Drama;
import com.fruitshorts.content.service.ContentLocaleTexts;
import com.fruitshorts.content.service.DramaClassificationService;
import com.fruitshorts.content.service.DramaService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** C 端推荐榜快照组装。 */
@Service
@RequiredArgsConstructor
public class AppRankingService {
private static final int MAX_RANKING_ITEMS = 50;
private final DramaClassificationService classificationService;
private final DramaService dramaService;
private final AppCatalogService catalogService;
/** 过滤未上线短剧后保持后台位置,排名连续补齐。 */
public AppRankingVO ranking(Long classificationId) {
var classification = classificationService.getEnabledById(classificationId);
if (!DramaClassificationService.LAYOUT_RANKING.equals(classification.getLayoutType())) {
throw new ServiceException(ErrorCode.OPERATION_NOT_ALLOWED, "该分类不是推荐榜");
}
List<Long> ids = classificationService.listDramaIdsByClassification(classificationId);
List<Drama> ordered = orderedPublished(ids).stream().limit(MAX_RANKING_ITEMS).toList();
List<AppDramaCardVO> cards = catalogService.toCards(ordered);
List<AppRankingEntryVO> entries = entries(cards);
Map<String, String> locales = ContentLocaleTexts.read(
classification.getNameLocales(), classification.getName(),
classification.getNameEn(), classification.getNameId());
AppRankingVO ranking = new AppRankingVO();
ranking.setId(classification.getId());
ranking.setCode(classification.getCode());
ranking.setLocales(locales);
ranking.setRevision(classification.getRevision() == null ? 1L : classification.getRevision());
ranking.setGeneratedAt(classification.getUpdatedAt());
ranking.setTotal(entries.size());
ranking.setList(entries);
return ranking;
}
private List<AppRankingEntryVO> entries(List<AppDramaCardVO> cards) {
List<AppRankingEntryVO> entries = new ArrayList<>();
for (int index = 0; index < cards.size(); index++) {
entries.add(new AppRankingEntryVO(index + 1, cards.get(index)));
}
return entries;
}
private List<Drama> orderedPublished(List<Long> ids) {
if (ids.isEmpty()) {
return List.of();
}
Map<Long, Integer> positions = new HashMap<>();
for (int index = 0; index < ids.size(); index++) {
positions.put(ids.get(index), index);
}
return dramaService.listPublishedByIds(ids).stream()
.sorted((left, right) -> Integer.compare(
positions.getOrDefault(left.getId(), Integer.MAX_VALUE),
positions.getOrDefault(right.getId(), Integer.MAX_VALUE)))
.toList();
}
}
@@ -11,10 +11,15 @@ import java.util.Map;
public class AppCategoryVO {
private Long id;
private String code;
private String layoutType;
private Long revision;
private Map<String, String> locales;
public AppCategoryVO(Long id, String name) {
this.id = id;
this.layoutType = "GRID";
this.revision = 1L;
this.locales = name == null || name.isBlank() ? Map.of() : Map.of("zh", name);
}
}
@@ -0,0 +1,15 @@
// Author: fruit.com.cn
package com.fruitshorts.app.vo;
import lombok.AllArgsConstructor;
import lombok.Data;
/** 推荐榜单项,排名由服务端确定。 */
@Data
@AllArgsConstructor
public class AppRankingEntryVO {
private Integer rank;
private AppDramaCardVO drama;
}
@@ -0,0 +1,22 @@
// Author: fruit.com.cn
package com.fruitshorts.app.vo;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
/** 推荐榜快照。 */
@Data
public class AppRankingVO {
private Long id;
private String code;
private Map<String, String> locales;
private Long revision;
private LocalDateTime generatedAt;
private Integer total;
private List<AppRankingEntryVO> list;
}