ADD: 基线

recommend-server-client/src/main/java/com/tzld/piaoquan/recommend/server/client/ModelClient.java

@@ -3,7 +3,6 @@ package com.tzld.piaoquan.recommend.server.client;
 import com.tzld.piaoquan.recommend.server.gen.model.ModelServiceGrpc;
 import com.tzld.piaoquan.recommend.server.gen.model.ScoreRequest;
 import com.tzld.piaoquan.recommend.server.gen.model.ScoreResponse;
-import lombok.extern.slf4j.Slf4j;
 import net.devh.boot.grpc.client.inject.GrpcClient;
 import org.springframework.stereotype.Component;
 
@@ -13,7 +12,6 @@ import java.util.Map;
  * @author dyp
  */
 @Component
-@Slf4j
 public class ModelClient {
     @GrpcClient("recommend-server")
     private ModelServiceGrpc.ModelServiceBlockingStub client;
@@ -28,12 +26,12 @@ public class ModelClient {
                 .build();
         ScoreResponse response = client.score(request);
         if (response == null || !response.hasResult()) {
-            log.info("score grpc error");
+//            log.info("score grpc error");
             return null;
         }
         if (response.getResult().getCode() != 1) {
-            log.info("score grpc code={}, msg={}", response.getResult().getCode(),
-                    response.getResult().getMessage());
+//            log.info("score grpc code={}, msg={}", response.getResult().getCode(),
+//                    response.getResult().getMessage());
             return null;
         }
         return response.getScoreMap();

recommend-server-service/pom.xml

@@ -205,20 +205,6 @@
             <groupId>org.mongodb</groupId>
             <artifactId>mongodb-driver-sync</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-
-
     </dependencies>
 
 

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

@@ -57,8 +57,8 @@ public class FlowPoolRecommendPipeline {
 
         // Step 4: Advance Scoring
         timestamp = System.currentTimeMillis();
-        ScorerPipeline scorerPipeline = getScorerPipeline(requestData);
-        items = scorerPipeline.scoring(requestData, userInfo, requestIndex, items);
+//        ScorerPipeline scorerPipeline = getScorerPipeline(requestData);
+//        items = scorerPipeline.scoring(requestData, userInfo, requestIndex, items);
 
 
         // Step 5: Merger

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

@@ -31,9 +31,9 @@ public class TopRecommendPipeline {
     public static final String PREFIX = "";
 
 
-    private List<RankItem> feedByRec(final RecommendRequest requestData,
-                                       final int requestIndex,
-                                       final User userInfo) {
+    public List<RankItem> feedByRec(final RecommendRequest requestData,
+                                    final int requestIndex,
+                                    final User userInfo) {
         int recallNum =  200;
 
         // Step 1: Attention extraction
@@ -60,8 +60,8 @@ public class TopRecommendPipeline {
 
         // Step 4: Advance Scoring
         timestamp = System.currentTimeMillis();
-        ScorerPipeline scorerPipeline = getScorerPipeline(requestData);
-        items = scorerPipeline.scoring(requestData, userInfo, requestIndex, items);
+//        ScorerPipeline scorerPipeline = getScorerPipeline(requestData);
+//        items = scorerPipeline.scoring(requestData, userInfo, requestIndex, items);
 
 
         // Step 5: Merger

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/AbstractFilterService.java

@@ -219,7 +219,7 @@ public abstract class AbstractFilterService {
                 log.info("{} param {} result {} cost {} ms", strategy.getClass().getSimpleName(),
                         JSONUtils.toJson(param.getVideoIds()),
                         JSONUtils.toJson(result),
-                        stopwatch.elapsed().toMillis());
+                        stopwatch.elapsed(TimeUnit.MILLISECONDS));
                 return result;
             });
             futures.add(future);

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/web/RecommendV2Controller.java

@@ -1,19 +1,22 @@
 package com.tzld.piaoquan.recommend.server.web;
 
+import com.alibaba.fastjson.JSONObject;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.tzld.piaoquan.recommend.server.client.ProtobufUtils;
+import com.tzld.piaoquan.recommend.server.common.base.RankItem;
 import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest;
 import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse;
+import com.tzld.piaoquan.recommend.server.implement.TopRecommendPipeline;
 import com.tzld.piaoquan.recommend.server.service.RecommendService;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author dyp
  */
@@ -49,4 +52,19 @@ public class RecommendV2Controller {
         }
         return result;
     }
+
+    @RequestMapping("/test/feedByRec")
+    public String feedByRec(@RequestBody RecommendRequest httpRequest) {
+        MDC.put("appType", String.valueOf(httpRequest.getAppType()));
+
+        TopRecommendPipeline topRecommendPipeline = new TopRecommendPipeline();
+        List<RankItem> rankItems = topRecommendPipeline.feedByRec(httpRequest, 0, null);
+        String result = "";
+        try {
+            result = JSONObject.toJSONString(rankItems);
+        } catch (Exception e) {
+            log.error("feedByRec ProtobufUtils.toJson", e);
+        }
+        return result;
+    }
 }