ADD: ros召回

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/candidate/Global1hHotCandidate.java

@@ -27,9 +27,9 @@ public class Global1hHotCandidate extends IndexCandidateQueue {
 
 
         BigDecimal recallNumBigDecimal = BigDecimal.valueOf(recallNum);
-        int strNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.1)).intValue();
-        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
-        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
+        int rosNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.6)).intValue();
+        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
+        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
 
 
         QueueName queueName = new QueueName(ItemType, "rov")
@@ -40,9 +40,9 @@ public class Global1hHotCandidate extends IndexCandidateQueue {
                 .addMatch("type", "global1h");
         currRecall += addCandidateKey(simplifiedCandidates, queueName, shortRovNum, getStrategyQueueInfo().getQueueName());
 
-        queueName = new QueueName(ItemType, "str")
+        queueName = new QueueName(ItemType, "short_ros")
                 .addMatch("type", "global1h");
-        currRecall += addCandidateKey(simplifiedCandidates, queueName, strNum, getStrategyQueueInfo().getQueueName());
+        currRecall += addCandidateKey(simplifiedCandidates, queueName, rosNum, getStrategyQueueInfo().getQueueName());
 
 
         candidates.putAll(simplifiedCandidates);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/candidate/Global24hHotCandidate.java

@@ -23,11 +23,11 @@ public class Global24hHotCandidate extends IndexCandidateQueue {
     @Override
     public int addCandidateKey(Map<String, Candidate> candidates, int recallNum, User user, RecommendRequest requestData, int requestIndex, int expId) {
         int currRecall = 0;
-        Map<String, Candidate> simplifiedCandidates = new ConcurrentHashMap<String, Candidate>();
+        Map<String, Candidate> simplifiedCandidates = new ConcurrentHashMap<>();
 
         BigDecimal recallNumBigDecimal = BigDecimal.valueOf(recallNum);
-        int strNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.1)).intValue();
-        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.9)).intValue();
+        int rosNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.6)).intValue();
+        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.4)).intValue();
 
 
         QueueName queueName = new QueueName(ItemType, "rov")
@@ -35,9 +35,9 @@ public class Global24hHotCandidate extends IndexCandidateQueue {
         currRecall += addCandidateKey(simplifiedCandidates, queueName, rovNum, getStrategyQueueInfo().getQueueName());
 
 
-        queueName = new QueueName(ItemType, "str")
+        queueName = new QueueName(ItemType, "short_ros")
                 .addMatch("type", "global24h");
-        currRecall += addCandidateKey(simplifiedCandidates, queueName, strNum, getStrategyQueueInfo().getQueueName());
+        currRecall += addCandidateKey(simplifiedCandidates, queueName, rosNum, getStrategyQueueInfo().getQueueName());
 
         candidates.putAll(simplifiedCandidates);
         return currRecall;

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/candidate/Global3hHotCandidate.java

@@ -27,9 +27,9 @@ public class Global3hHotCandidate extends IndexCandidateQueue {
 
 
         BigDecimal recallNumBigDecimal = BigDecimal.valueOf(recallNum);
-        int strNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.1)).intValue();
-        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
-        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
+        int rosNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.6)).intValue();
+        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
+        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
 
 
         QueueName queueName = new QueueName(ItemType, "rov")
@@ -40,9 +40,9 @@ public class Global3hHotCandidate extends IndexCandidateQueue {
                 .addMatch("type", "global3h");
         currRecall += addCandidateKey(simplifiedCandidates, queueName, shortRovNum, getStrategyQueueInfo().getQueueName());
 
-        queueName = new QueueName(ItemType, "str")
+        queueName = new QueueName(ItemType, "short_ros")
                 .addMatch("type", "global3h");
-        currRecall += addCandidateKey(simplifiedCandidates, queueName, strNum, getStrategyQueueInfo().getQueueName());
+        currRecall += addCandidateKey(simplifiedCandidates, queueName, rosNum, getStrategyQueueInfo().getQueueName());
 
 
         candidates.putAll(simplifiedCandidates);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/candidate/Region1hHotCandidate.java

@@ -27,9 +27,9 @@ public class Region1hHotCandidate extends IndexCandidateQueue {
         Map<String, Candidate> simplifiedCandidates = new ConcurrentHashMap<String, Candidate>();
 
         BigDecimal recallNumBigDecimal = BigDecimal.valueOf(recallNum);
-        int strNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.1)).intValue();
-        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
-        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
+        int rosNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.6)).intValue();
+        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
+        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
 
 
         QueueName queueName = new QueueName(ItemType, "short_rov")
@@ -45,10 +45,10 @@ public class Region1hHotCandidate extends IndexCandidateQueue {
         currRecall += addCandidateKey(simplifiedCandidates, queueName, rovNum,
                 getStrategyQueueInfo().getQueueName());
 
-        queueName = new QueueName(ItemType, "str")
+        queueName = new QueueName(ItemType, "short_ros")
                 .addMatch("type", "region1h")
                 .addMatch("region", region);
-        currRecall += addCandidateKey(simplifiedCandidates, queueName, strNum,
+        currRecall += addCandidateKey(simplifiedCandidates, queueName, rosNum,
                 getStrategyQueueInfo().getQueueName());
 
         candidates.putAll(simplifiedCandidates);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/candidate/Region24hHotCandidate.java

@@ -28,8 +28,8 @@ public class Region24hHotCandidate extends IndexCandidateQueue {
 
 
         BigDecimal recallNumBigDecimal = BigDecimal.valueOf(recallNum);
-        int strNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.1)).intValue();
-        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.9)).intValue();
+        int rosNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.6)).intValue();
+        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.4)).intValue();
 
         // index key  video:queue:type=region24h:region=北京:ordering=rov
         QueueName queueName = new QueueName(ItemType, "rov")
@@ -38,10 +38,10 @@ public class Region24hHotCandidate extends IndexCandidateQueue {
         currRecall += addCandidateKey(simplifiedCandidates, queueName, rovNum, getStrategyQueueInfo().getQueueName());
 
         // index key  video:queue:type=region24h:region=北京:ordering=str
-        queueName = new QueueName(ItemType, "str")
+        queueName = new QueueName(ItemType, "short_ros")
                 .addMatch("type", "region24h")
                 .addMatch("region", region);
-        currRecall += addCandidateKey(simplifiedCandidates, queueName, strNum,
+        currRecall += addCandidateKey(simplifiedCandidates, queueName, rosNum,
                 getStrategyQueueInfo().getQueueName());
 
         candidates.putAll(simplifiedCandidates);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/implement/candidate/Region3hHotCandidate.java

@@ -27,9 +27,9 @@ public class Region3hHotCandidate extends IndexCandidateQueue {
         Map<String, Candidate> simplifiedCandidates = new ConcurrentHashMap<>();
 
         BigDecimal recallNumBigDecimal = BigDecimal.valueOf(recallNum);
-        int strNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.1)).intValue();
-        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
-        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.45)).intValue();
+        int rosNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.6)).intValue();
+        int rovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
+        int shortRovNum = recallNumBigDecimal.multiply(BigDecimal.valueOf(0.2)).intValue();
 
 
         // index key video:queue:type=region3h:region=北京:ordering=short_rov
@@ -47,10 +47,10 @@ public class Region3hHotCandidate extends IndexCandidateQueue {
                 getStrategyQueueInfo().getQueueName());
 
         // index key video:queue:type=region3h:region=北京:ordering=str
-        queueName = new QueueName(ItemType, "str")
+        queueName = new QueueName(ItemType, "short_ros")
                 .addMatch("type", "region3h")
                 .addMatch("region", region);
-        currRecall += addCandidateKey(simplifiedCandidates, queueName, strNum,
+        currRecall += addCandidateKey(simplifiedCandidates, queueName, rosNum,
                 getStrategyQueueInfo().getQueueName());