|
@@ -7,7 +7,6 @@ import com.tzld.longarticle.recommend.server.service.recommend.rank.RankItem;
|
|
|
import com.tzld.longarticle.recommend.server.service.recommend.rank.RankParam;
|
|
|
import com.tzld.longarticle.recommend.server.service.recommend.rank.RankResult;
|
|
|
import com.tzld.longarticle.recommend.server.service.recommend.rank.RankStrategy;
|
|
|
-import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreParam;
|
|
|
import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreResult;
|
|
|
import com.tzld.longarticle.recommend.server.service.recommend.score.ScoreService;
|
|
|
import com.tzld.longarticle.recommend.server.util.CommonCollectionUtils;
|
|
@@ -17,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.*;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
@Service
|
|
|
@Slf4j
|
|
@@ -33,14 +31,11 @@ public class RandomRankStrategy implements RankStrategy {
|
|
|
public RankResult rank(RankParam param) {
|
|
|
List<Content> result = new ArrayList<>();
|
|
|
String[] contentPools = accountContentPoolConfigService.getContentPools(param.getAccountName());
|
|
|
- ScoreParam scoreParam = RankStrategy.convertToScoreParam(param);
|
|
|
- scoreParam.setContents(scoreParam.getContents().stream().filter(
|
|
|
- c -> contentPools[2].equals(c.getContentPoolType())).collect(Collectors.toList()));
|
|
|
ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
|
|
|
|
|
|
Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
|
|
|
|
|
|
- List<RankItem> items = CommonCollectionUtils.toList(scoreParam.getContents(), c -> {
|
|
|
+ List<RankItem> items = CommonCollectionUtils.toList(param.getContents(), c -> {
|
|
|
RankItem item = new RankItem();
|
|
|
item.setContent(c);
|
|
|
return item;
|