特征调整

src/main/scala/com/aliyun/odps/spark/examples/myUtils/ConvertUtils.java

@@ -28,9 +28,8 @@ public class ConvertUtils {
         UserShareReturnProfile userProfile = JSON.parseObject(toJson(c9Map), UserShareReturnProfile.class);
         Map<String, Map<String, String>> historyVideoMap = list2Map(videoSeq);
 
-        List<String> cfList = Arrays.asList("share", "return");
-        Map<String, Map<String, String[]>> c7Map = FeatureTransform.parseUCFScore(cfList, userOriginInfo.get("alg_mid_feature_sharecf"));
-        Map<String, Map<String, String[]>> c8Map = FeatureTransform.parseUCFScore(cfList, userOriginInfo.get("alg_mid_feature_returncf"));
+        Map<String, Map<String, String[]>> c7Map = FeatureTransform.parseUCFScore(userOriginInfo.get("alg_mid_feature_sharecf"));
+        Map<String, Map<String, String[]>> c8Map = FeatureTransform.parseUCFScore(userOriginInfo.get("alg_mid_feature_returncf"));
 
         // context feature
         FeatureTransform.getContextFeature(currentMs, featMap);
@@ -45,8 +44,8 @@ public class ConvertUtils {
         // user & video feature
         FeatureTransform.getUserTagsCrossVideoFeature("c5", rankInfo, userOriginInfo.get("alg_mid_feature_return_tags"), featMap);
         FeatureTransform.getUserTagsCrossVideoFeature("c6", rankInfo, userOriginInfo.get("alg_mid_feature_share_tags"), featMap);
-        FeatureTransform.getUserCFFeature("c7", vid, cfList, c7Map, featMap);
-        FeatureTransform.getUserCFFeature("c8", vid, cfList, c8Map, featMap);
+        FeatureTransform.getUserCFFeature("c7", vid, c7Map, featMap);
+        FeatureTransform.getUserCFFeature("c8", vid, c8Map, featMap);
 
         // rank video feature
         FeatureTransform.getVideoBaseFeature("r", currentMs, rankInfo, featMap);

src/main/scala/com/aliyun/odps/spark/examples/myUtils/FeatureTransform.java

@@ -26,6 +26,7 @@ public class FeatureTransform {
     private static final List<String> videoCateAttrs = Arrays.asList(FeatureUtils.cate1Attr, FeatureUtils.cate2Attr, FeatureUtils.festive1Attr);
     private static final List<String> videoSimAttrs = Arrays.asList("title", "cate2", "cate2_list", "keywords");
     private static final List<String> hVideoSimAttrs = Arrays.asList("title");
+    private static final List<String> cfList = Arrays.asList("share", "return");
 
     public static void getContextFeature(long currentMs, Map<String, Double> featureMap) {
         Calendar calendar = Calendar.getInstance();
@@ -95,7 +96,7 @@ public class FeatureTransform {
         }
     }
 
-    public static void getUserCFFeature(String prefix, String vid, List<String> cfList, Map<String, Map<String, String[]>> infoMap, Map<String, Double> featMap) {
+    public static void getUserCFFeature(String prefix, String vid, Map<String, Map<String, String[]>> infoMap, Map<String, Double> featMap) {
         if (vid.isEmpty() || null == infoMap || infoMap.isEmpty()) {
             return;
         }
@@ -313,7 +314,7 @@ public class FeatureTransform {
         featMap.put(prefix + "_rovn", rovn);
     }
 
-    public static Map<String, Map<String, String[]>> parseUCFScore(List<String> cfList, Map<String, String> mapInfo) {
+    public static Map<String, Map<String, String[]>> parseUCFScore(Map<String, String> mapInfo) {
         Map<String, Map<String, String[]>> allScoresMap = new HashMap<>();
         for (String cfType : cfList) {
             String data = mapInfo.getOrDefault(cfType, "");