Merge branch 'feature/zhangbo_model' of algorithm/recommend-server into feature_feature

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV999.java

@@ -84,8 +84,10 @@ public class RankStrategy4RegionMergeModelV999 extends RankStrategy4RegionMergeM
         // TODO 1 批量获取特征  省份参数要对齐  headvid  要传递过来！
         List<String> vids = CommonCollectionUtils.toListDistinct(rovRecallRank, v -> String.valueOf(v.getVideoId()));
         // k1:视频、k2:表、k3:特征、v:特征值
+        String provinceCn = param.getProvince();
+        provinceCn = provinceCn.replaceAll("省$", "");
         FeatureService.Feature feature = featureService.getFeature(param.getMid(), vids,
-                String.valueOf(param.getAppType()), param.getProvince(), "");
+                String.valueOf(param.getAppType()), provinceCn, "");
 
         Map<String, Map<String, String>> featureOriginUser = feature.getUserFeature();
         Map<String, Map<String, Map<String, String>>> featureOriginVideo = feature.getVideoFeature();

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

@@ -34,7 +34,8 @@ public class RecommendController {
 
     @RequestMapping("/demo")
     public String demo() {
-        return JSONUtils.toJson(featureService.getFeature(Lists.newArrayList("10054148", "20637161"), "0", "1"));
+//        return JSONUtils.toJson(featureService.getFeature(Lists.newArrayList("10054148", "20637161"), "0", "1"));
+        return "";
     }
 
     @RequestMapping("/homepage/recommend")