wangyunpeng 9 månader sedan
förälder
incheckning
79ad61df7d
14 ändrade filer med 12 tillägg och 30 borttagningar
  1. 1 4
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/DefaultRankStrategy.java
  2. 0 1
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/FwhColdStartRankStrategy.java
  3. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV10Strategy.java
  4. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV11Strategy.java
  5. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV12Strategy.java
  6. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV13Strategy.java
  7. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV14Strategy.java
  8. 0 3
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV2Strategy.java
  9. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV3Strategy.java
  10. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV4Strategy.java
  11. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV5Strategy.java
  12. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV7Strategy.java
  13. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV8Strategy.java
  14. 1 2
      long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV9Strategy.java

+ 1 - 4
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/DefaultRankStrategy.java

@@ -39,10 +39,8 @@ public class DefaultRankStrategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
-        ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
-        //log.info("ScoreResult {}", JSONUtils.toJson(scoreResult));
 
+        ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
 
         List<RankItem> items = CommonCollectionUtils.toList(param.getContents(), c -> {
@@ -94,7 +92,6 @@ public class DefaultRankStrategy implements RankStrategy {
         List<Content> contents = CommonCollectionUtils.toList(sortedItems, RankItem::getContent);
 
         // 3 相似去重
-//        contents = deduplication(contents);
         log.info("Deduplication {}", JSONUtils.toJson(contents));
         String[] publishPool = Arrays.copyOf(contentPools, contentPools.length);
 

+ 0 - 1
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/FwhColdStartRankStrategy.java

@@ -68,7 +68,6 @@ public class FwhColdStartRankStrategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 选文章
         List<Content> result = new ArrayList<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV10Strategy.java

@@ -38,7 +38,7 @@ public class RankV10Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -82,7 +82,6 @@ public class RankV10Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV11Strategy.java

@@ -39,7 +39,7 @@ public class RankV11Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -102,7 +102,6 @@ public class RankV11Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV12Strategy.java

@@ -39,7 +39,7 @@ public class RankV12Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -102,7 +102,6 @@ public class RankV12Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV13Strategy.java

@@ -39,7 +39,7 @@ public class RankV13Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -103,7 +103,6 @@ public class RankV13Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV14Strategy.java

@@ -39,7 +39,7 @@ public class RankV14Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -103,7 +103,6 @@ public class RankV14Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 0 - 3
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV2Strategy.java

@@ -33,10 +33,7 @@ public class RankV2Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
 
-        //log.info("RankParam {}", JSONUtils.toJson(param));
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
-        //log.info("ScoreResult {}", JSONUtils.toJson(scoreResult));
-
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
 
         List<RankItem> items = CommonCollectionUtils.toList(param.getContents(), c -> {

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV3Strategy.java

@@ -38,7 +38,7 @@ public class RankV3Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -81,7 +81,6 @@ public class RankV3Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV4Strategy.java

@@ -38,7 +38,7 @@ public class RankV4Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -81,7 +81,6 @@ public class RankV4Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV5Strategy.java

@@ -36,7 +36,7 @@ public class RankV5Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -79,7 +79,6 @@ public class RankV5Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV7Strategy.java

@@ -38,7 +38,7 @@ public class RankV7Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -82,7 +82,6 @@ public class RankV7Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV8Strategy.java

@@ -38,7 +38,7 @@ public class RankV8Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -85,7 +85,6 @@ public class RankV8Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();

+ 1 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/rank/strategy/RankV9Strategy.java

@@ -38,7 +38,7 @@ public class RankV9Strategy implements RankStrategy {
 
     public RankResult rank(RankParam param) {
         List<Content> result = new ArrayList<>();
-        //log.info("RankParam {}", JSONUtils.toJson(param));
+
         ScoreResult scoreResult = scoreService.score(RankStrategy.convertToScoreParam(param));
 
         Map<String, Map<String, Double>> scoreMap = scoreResult.getScoreMap();
@@ -82,7 +82,6 @@ public class RankV9Strategy implements RankStrategy {
         Collections.sort(items, (o1, o2) -> -Double.compare(o1.getScore(), o2.getScore()));
         // 2 相似去重
         List<Content> contents = CommonCollectionUtils.toList(items, RankItem::getContent);
-//        contents = deduplication(contents);
 
         // 3 文章按照内容池分组
         Map<String, List<Content>> contentMap = new HashMap<>();