compatible

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

@@ -0,0 +1,18 @@
+package com.tzld.piaoquan.recommend.server.web;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author dyp
+ */
+@RestController
+@Slf4j
+public class HealthCheckController {
+
+    @GetMapping("/ok")
+    public String ok() {
+        return "ok";
+    }
+}

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

@@ -14,7 +14,6 @@ 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.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,9 +33,9 @@ public class RecommendController {
     }
 
     @RequestMapping("/homepage/recommend")
-    public String homepageRecommend(@RequestBody RecommendRequest httpRequest) {
+    public String homepageRecommend(@RequestBody RecommendHttpRequest httpRequest) {
         MDC.put("appType", String.valueOf(httpRequest.getAppType()));
-        RecommendResponse response = recommendService.homepageRecommend(httpRequest);
+        RecommendResponse response = recommendService.homepageRecommend(generate(httpRequest));
         String result = "";
         try {
             result = ProtobufUtils.toJson(response);
@@ -47,10 +46,10 @@ public class RecommendController {
     }
 
     @RequestMapping("/relevant/recommend")
-    public String relevantRecommend(@RequestBody RecommendRequest httpRequest) {
+    public String relevantRecommend(@RequestBody RecommendHttpRequest httpRequest) {
         MDC.put("appType", String.valueOf(httpRequest.getAppType()));
 
-        RecommendResponse response = recommendService.relevantRecommend(httpRequest);
+        RecommendResponse response = recommendService.relevantRecommend(generate(httpRequest));
         String result = "";
         try {
             result = ProtobufUtils.toJson(response);
@@ -75,8 +74,6 @@ public class RecommendController {
                 .setProvinceCode(Strings.nullToEmpty(httpRequest.getProvinceCode()))
                 .setVersionAuditStatus(httpRequest.getVersionAuditStatus())
                 .setRecommendTraceId(Strings.nullToEmpty(httpRequest.getRecommendTraceId()))
-                .setProvince(Strings.nullToEmpty(httpRequest.getProvince()))
-                .setCity(Strings.nullToEmpty(httpRequest.getCity()))
                 .setVideoId(httpRequest.getVideoId());
 
         if (CollectionUtils.isNotEmpty(httpRequest.getAbExpCodes())) {
@@ -88,9 +85,4 @@ public class RecommendController {
 
         return builder.build();
     }
-
-    @GetMapping("/ok")
-    public String ok() {
-        return "ok";
-    }
 }

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

@@ -0,0 +1,57 @@
+package com.tzld.piaoquan.recommend.server.web;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.tzld.piaoquan.recommend.server.client.ProtobufUtils;
+import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendRequest;
+import com.tzld.piaoquan.recommend.server.gen.recommend.RecommendResponse;
+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;
+
+/**
+ * @author dyp
+ */
+@RestController
+@Slf4j
+public class RecommendV2Controller {
+    @Autowired
+    private RecommendService recommendService;
+
+    @Bean
+    public ProtobufHttpMessageConverter protobufHttpMessageConverter() {
+        return new ProtobufHttpMessageConverter();
+    }
+
+    @RequestMapping("/homepage/recommend/v2")
+    public String homepageRecommend(@RequestBody RecommendRequest httpRequest) {
+        MDC.put("appType", String.valueOf(httpRequest.getAppType()));
+        RecommendResponse response = recommendService.homepageRecommend(httpRequest);
+        String result = "";
+        try {
+            result = ProtobufUtils.toJson(response);
+        } catch (InvalidProtocolBufferException e) {
+            log.error("homepageRecommend ProtobufUtils.toJson", e);
+        }
+        return result;
+    }
+
+    @RequestMapping("/relevant/recommend/v2")
+    public String relevantRecommend(@RequestBody RecommendRequest httpRequest) {
+        MDC.put("appType", String.valueOf(httpRequest.getAppType()));
+
+        RecommendResponse response = recommendService.relevantRecommend(httpRequest);
+        String result = "";
+        try {
+            result = ProtobufUtils.toJson(response);
+        } catch (InvalidProtocolBufferException e) {
+            log.error("relevantRecommend ProtobufUtils.toJson", e);
+        }
+        return result;
+    }
+}