融合 553 567 568 优势

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

@@ -715,7 +715,7 @@ public class RankStrategy4RegionMergeModelV552 extends RankService {
         String up2 = "2024031012:409,2024031013:464,2024031014:354,2024031015:474,2024031016:436,2024031017:636,2024031018:709,2024031019:741,2024031020:802,2024031021:904,2024031022:1112,2024031023:639,2024031100:378,2024031101:78,2024031102:47,2024031103:37,2024031104:17,2024031105:49,2024031106:103,2024031107:293,2024031108:457,2024031109:488,2024031110:558,2024031111:711,2024031112:785,2024031113:830,2024031114:974,2024031115:850";
         String down2 = "2024031012:748,2024031013:886,2024031014:788,2024031015:1029,2024031016:957,2024031017:1170,2024031018:1208,2024031019:1181,2024031020:1275,2024031021:1265,2024031022:1512,2024031023:1190,2024031100:1127,2024031101:486,2024031102:289,2024031103:254,2024031104:197,2024031105:310,2024031106:344,2024031107:693,2024031108:976,2024031109:1045,2024031110:1039,2024031111:1257,2024031112:1202,2024031113:1454,2024031114:1785,2024031115:1544";
 
-        RankStrategy4RegionMergeModelV564 job = new RankStrategy4RegionMergeModelV564();
+        RankStrategy4RegionMergeModelV552 job = new RankStrategy4RegionMergeModelV552();
         List<Double> l1 = job.getRateData(job.help(up1, "2024031115", 24), job.help(down1, "2024031115", 24), 1., 10.);
         Double d1 = job.calScoreWeightNoTimeDecay(l1);
 

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

@@ -686,7 +686,7 @@ public class RankStrategy4RegionMergeModelV553 extends RankService {
         String up2 = "2024031012:409,2024031013:464,2024031014:354,2024031015:474,2024031016:436,2024031017:636,2024031018:709,2024031019:741,2024031020:802,2024031021:904,2024031022:1112,2024031023:639,2024031100:378,2024031101:78,2024031102:47,2024031103:37,2024031104:17,2024031105:49,2024031106:103,2024031107:293,2024031108:457,2024031109:488,2024031110:558,2024031111:711,2024031112:785,2024031113:830,2024031114:974,2024031115:850";
         String down2 = "2024031012:748,2024031013:886,2024031014:788,2024031015:1029,2024031016:957,2024031017:1170,2024031018:1208,2024031019:1181,2024031020:1275,2024031021:1265,2024031022:1512,2024031023:1190,2024031100:1127,2024031101:486,2024031102:289,2024031103:254,2024031104:197,2024031105:310,2024031106:344,2024031107:693,2024031108:976,2024031109:1045,2024031110:1039,2024031111:1257,2024031112:1202,2024031113:1454,2024031114:1785,2024031115:1544";
 
-        RankStrategy4RegionMergeModelV564 job = new RankStrategy4RegionMergeModelV564();
+        RankStrategy4RegionMergeModelV553 job = new RankStrategy4RegionMergeModelV553();
         List<Double> l1 = job.getRateData(job.help(up1, "2024031115", 24), job.help(down1, "2024031115", 24), 1., 10.);
         Double d1 = job.calScoreWeightNoTimeDecay(l1);
 

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

@@ -74,39 +74,47 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
         oldRovs.addAll(extractAndSort(param, RegionRelative24HDupRecallStrategy.PUSH_FORM));
         int sizeReturn = param.getSize();
         removeDuplicate(oldRovs);
-        oldRovs = oldRovs.size() <= sizeReturn
+        List<Video> v0 = oldRovs.size() <= sizeReturn
                 ? oldRovs
                 : oldRovs.subList(0, sizeReturn);
-        Set<Long> setVideo = new HashSet<>();
-        this.duplicate(setVideo, oldRovs);
 
         //-------------------地域相关召回 融合+去重-------------------
-        List<Video> rovRecallRank = new ArrayList<>();
         List<Video> v1 = extractAndSort(param, RegionRealtimeRecallStrategyV1.PUSH_FORM);
-        List<Video> v2 = extractAndSort(param, RegionRealtimeRecallStrategyV2.PUSH_FORM);
+        List<Video> v2 = extractAndSort(param, RegionRealtimeRecallStrategyV2_sort.PUSH_FORM);
         List<Video> v3 = extractAndSort(param, RegionRealtimeRecallStrategyV3.PUSH_FORM);
         List<Video> v4 = extractAndSort(param, RegionRealtimeRecallStrategyV4.PUSH_FORM);
-        this.duplicate(setVideo, v1);
-        this.duplicate(setVideo, v2);
-        this.duplicate(setVideo, v3);
-        this.duplicate(setVideo, v4);
         //-------------------相关性召回 融合+去重-------------------
         List<Video> v5 = extractAndSort(param, SimHotVideoRecallStrategy.PUSH_FORM);
         List<Video> v6 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
-        this.duplicate(setVideo, v5);
-        this.duplicate(setVideo, v6);
         //-------------------节日扶持召回 融合+去重-------------------
         List<Video> v7 = extractAndSort(param, FestivalRecallStrategyV1.PUSH_FORM);
+        //-------------------流量池回捞-------------------
+        List<Video> v9 = extractAndSort(param, FlowPoolLastDayTopRecallStrategy.PUSH_FORM);
+
+        // 去重
+        Set<Long> setVideo = new HashSet<>();
+        this.duplicate(setVideo, v0);
+        this.duplicate(setVideo, v5);
+        this.duplicate(setVideo, v6);
+        this.duplicate(setVideo, v4);
+        this.duplicate(setVideo, v3);
+        this.duplicate(setVideo, v2);
+        this.duplicate(setVideo, v9);
+        this.duplicate(setVideo, v1);
         this.duplicate(setVideo, v7);
 
-        rovRecallRank.addAll(oldRovs);
-        rovRecallRank.addAll(v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 20.0).intValue(), v1.size())));
+
+
+        List<Video> rovRecallRank = new ArrayList<>();
+        rovRecallRank.addAll(v0);
+        rovRecallRank.addAll(v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 25.0).intValue(), v1.size())));
         rovRecallRank.addAll(v2.subList(0, Math.min(mergeWeight.getOrDefault("v2", 15.0).intValue(), v2.size())));
         rovRecallRank.addAll(v3.subList(0, Math.min(mergeWeight.getOrDefault("v3", 10.0).intValue(), v3.size())));
-        rovRecallRank.addAll(v4.subList(0, Math.min(mergeWeight.getOrDefault("v4", 0.0).intValue(), v4.size())));
-        rovRecallRank.addAll(v5.subList(0, Math.min(mergeWeight.getOrDefault("v5", 10.0).intValue(), v5.size())));
-        rovRecallRank.addAll(v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 10.0).intValue(), v6.size())));
-        rovRecallRank.addAll(v7.subList(0, Math.min(mergeWeight.getOrDefault("v7", 10.0).intValue(), v7.size())));
+        rovRecallRank.addAll(v4.subList(0, Math.min(mergeWeight.getOrDefault("v4", 5.0).intValue(), v4.size())));
+        rovRecallRank.addAll(v5.subList(0, Math.min(mergeWeight.getOrDefault("v5", 5.0).intValue(), v5.size())));
+        rovRecallRank.addAll(v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 5.0).intValue(), v6.size())));
+        rovRecallRank.addAll(v7.subList(0, Math.min(mergeWeight.getOrDefault("v7", 5.0).intValue(), v7.size())));
+        rovRecallRank.addAll(v9.subList(0, Math.min(mergeWeight.getOrDefault("v9", 5.0).intValue(), v9.size())));
 
         //-------------------排-------------------
         //-------------------序-------------------
@@ -116,22 +124,16 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
         // 1 模型分
         List<String> rtFeaPart = new ArrayList<>();
         List<RankItem> items = model(rovRecallRank, param, rtFeaPart);
-        List<String> rtFeaPartKey = new ArrayList<>(Arrays.asList("item_rt_fea_1day_partition",
-                "item_rt_fea_1h_partition",
-                "item_rt_fea_1hroot_partition"));
+        List<String> rtFeaPartKey = new ArrayList<>(Arrays.asList("item_rt_fea_1day_partition", "item_rt_fea_1h_partition"));
         List<String> rtFeaPartKeyResult = this.redisTemplate.opsForValue().multiGet(rtFeaPartKey);
         Calendar calendar = Calendar.getInstance();
         String date = new SimpleDateFormat("yyyyMMdd").format(calendar.getTime());
         String hour = new SimpleDateFormat("HH").format(calendar.getTime());
         String rtFeaPart1h = date + hour;
-        String rtFeaPart1hRoot = date + hour;
         if (rtFeaPartKeyResult != null) {
             if (rtFeaPartKeyResult.get(1) != null) {
                 rtFeaPart1h = rtFeaPartKeyResult.get(1);
             }
-            if (rtFeaPartKeyResult.get(2) != null) {
-                rtFeaPart1hRoot = rtFeaPartKeyResult.get(2);
-            }
         }
         // 2 统计分
         String cur = rtFeaPart1h;
@@ -140,11 +142,9 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
             datehours.add(cur);
             cur = ExtractorUtils.subtractHours(cur, 1);
         }
-        cur = rtFeaPart1hRoot;
-        List<String> datehoursRoot = new LinkedList<>(); // 时间是倒叙的
+        List<String> datehoursRoot = new LinkedList<>();
         for (int i = 0; i < 24; ++i) {
-            datehoursRoot.add(cur);
-            cur = ExtractorUtils.subtractHours(cur, 1);
+            datehoursRoot.add(String.valueOf(i+1));
         }
         // 2.1 item特征提取
         this.getVideoFeatureFromRedis(items);
@@ -152,28 +152,15 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
 
         for (RankItem item : items) {
             Map<String, Map<String, Double>> itemRealRootMap = item.getItemRealTimeRootFeature();
-            List<Double> views_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "view");
-            List<Double> share_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "share");
-            List<Double> return1_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return1");
-            List<Double> return2_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return2");
-            List<Double> return3_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return3");
-            List<Double> return4_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return4");
-            List<Double> return12_20240408 = this.merge2List(return1_20240408, return2_20240408);
-            List<Double> rov_20240408 = getRateData(return12_20240408, views_20240408, 0.0, 0.0);
-            Double rovScore_20240408 = calScoreWeightNoTimeDecay(rov_20240408);
-            List<Double> ros_20240408 = getRateData(return12_20240408, share_20240408, 1.0, 10.0);
-            Double rosScore_20240408 = calScoreWeightNoTimeDecay(ros_20240408);
-            item.scoresMap.put("rovScore_20240408", rovScore_20240408);
-            item.scoresMap.put("rosScore_20240408", rosScore_20240408);
-
-
-            List<Double> fissionList =  getRateData(
-                    this.merge2List(return2_20240408, return4_20240408),
-                    this.merge2List(return1_20240408, return3_20240408),
-                    1.0, 1000.0
-            );
-            Double fissionScore = calScoreWeightNoTimeDecay(fissionList);
-            item.scoresMap.put("fissionScore", fissionScore);
+            List<Double> views_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "exp");
+            List<Double> share_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "share");
+            List<Double> return_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "return");
+            List<Double> rov_20240410 = getRateData(return_20240410, views_20240410, 0.0, 0.0);
+            Double rovScore_20240410 = calScoreWeightNoTimeDecay(rov_20240410);
+            List<Double> ros_20240410 = getRateData(return_20240410, share_20240410, 1.0, 10.0);
+            Double rosScore_20240410 = calScoreWeightNoTimeDecay(ros_20240410);
+            item.scoresMap.put("rovScore_20240410", rovScore_20240410);
+            item.scoresMap.put("rosScore_20240410", rosScore_20240410);
 
             Map<String, Map<String, Double>> itemRealMap = item.getItemRealTimeFeature();
             List<Double> views = getStaticData(itemRealMap, datehours, "view_pv_list_1h");
@@ -228,11 +215,9 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
         double c = mergeWeight.getOrDefault("c", 0.000001);
         double d = mergeWeight.getOrDefault("d", 1.0);
         double e = mergeWeight.getOrDefault("e", 1.0);
-        double f = mergeWeight.getOrDefault("f", 0.6);
+        double f = mergeWeight.getOrDefault("f", 0.1);
         double g = mergeWeight.getOrDefault("g", 2.0);
-        double h = mergeWeight.getOrDefault("h", 240.0);
-        double m = mergeWeight.getOrDefault("m", 0.0);
-        double n = mergeWeight.getOrDefault("n", 0.0);
+        double h = mergeWeight.getOrDefault("h", 50.0);
         double ifAdd = mergeWeight.getOrDefault("ifAdd", 1.0);
         for (RankItem item : items) {
             double trendScore = item.scoresMap.getOrDefault("trendScore", 0.0) > 1E-8 ?
@@ -244,8 +229,9 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
             double share2allreturnScore = item.scoresMap.getOrDefault("share2allreturnScore", 0.0);
             double view2allreturnScore = item.scoresMap.getOrDefault("view2allreturnScore", 0.0);
             double preturnsScore = Math.log(1 + item.scoresMap.getOrDefault("preturnsScore", 0.0));
-            double rovScore_20240408 = item.scoresMap.getOrDefault("rovScore_20240408", 0.0);
-            double rosScore_20240408 = item.scoresMap.getOrDefault("rosScore_20240408", 0.0);
+            double rovScore_20240410 = item.scoresMap.getOrDefault("rovScore_20240410", 0.0);
+            double rosScore_20240410 = item.scoresMap.getOrDefault("rosScore_20240410", 0.0);
+
             double score = 0.0;
             if (ifAdd < 0.5) {
                 score = Math.pow(strScore, a) * Math.pow(rosScore, b) + c * preturnsScore +
@@ -257,11 +243,8 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
             }
             double allreturnsScore = item.scoresMap.getOrDefault("allreturnsScore", 0.0);
             if (allreturnsScore > h) {
-                score += (f * rosScore_20240408 + g * rovScore_20240408);
+                score += (f * rosScore_20240410 + g * rovScore_20240410);
             }
-            double fissionScore = item.scoresMap.getOrDefault("fissionScore", 0.0);
-            score += m * fissionScore;
-
             Video video = item.getVideo();
             video.setScore(score);
             video.setSortScore(score);
@@ -269,7 +252,7 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
             video.setScoresMap(item.getScoresMap());
             result.add(video);
         }
-        result.sort(Comparator.comparingDouble(o -> -o.getSortScore()));
+        Collections.sort(result, Comparator.comparingDouble(o -> -o.getSortScore()));
         return result;
     }
 
@@ -660,7 +643,7 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
 
     private void getVideoFeatureFromRedis(List<RankItem> items){
         List<Long> videoIds = CommonCollectionUtils.toListDistinct(items, RankItem::getVideoId);
-        List<String> videoKeys = videoIds.stream().map(r -> "item_rt_fea_1hroot_" + r)
+        List<String> videoKeys = videoIds.stream().map(r -> "item_rt_fea_1hrootall_" + r)
                 .collect(Collectors.toList());
         List<String> videoRtFeatures = this.redisTemplate.opsForValue().multiGet(videoKeys);
         int j = 0;
@@ -691,57 +674,18 @@ public class RankStrategy4RegionMergeModelV563 extends RankService {
                     }
                     item.setItemRealTimeRootFeature(vfMapNew);
                 } catch (Exception e) {
-                    log.error(String.format("parse video item_rt_fea_1hroot_ json is wrong in {} with {}", this.CLASS_NAME, e));
+                    log.error(String.format("parse video item_rt_fea_1hrootall_ json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
             }
         }
     }
-    private List<Double> merge2List(List<Double> a, List<Double> b){
-        int size = a.size();
-        List<Double> result = new ArrayList<>(size);
-        for (int i = 0; i < size; ++i){
-            result.add(a.get(i) + b.get(i));
-        }
-        return result;
-    }
 
-    public static void main(String[] args) {
-//        String up1 = "2024031012:513,2024031013:456,2024031014:449,2024031015:262,2024031016:414,2024031017:431,2024031018:643,2024031019:732,2024031020:927,2024031021:859,2024031022:866,2024031023:358,2024031100:133,2024031101:28,2024031102:22,2024031103:15,2024031104:21,2024031105:36,2024031106:157,2024031107:371,2024031108:378,2024031109:216,2024031110:269,2024031111:299,2024031112:196,2024031113:186,2024031114:85,2024031115:82";
-        String up1 = "2024031012:1167,2024031013:1023,2024031014:947,2024031015:664,2024031016:842,2024031017:898,2024031018:1170,2024031019:1439,2024031020:2010,2024031021:1796,2024031022:1779,2024031023:722,2024031100:226,2024031101:50,2024031102:31,2024031103:30,2024031104:38,2024031105:63,2024031106:293,2024031107:839,2024031108:1250,2024031109:858,2024031110:767,2024031111:697,2024031112:506,2024031113:534,2024031114:381,2024031115:278";
-        String down1 = "2024031012:2019,2024031013:1676,2024031014:1626,2024031015:1458,2024031016:1508,2024031017:1510,2024031018:1713,2024031019:1972,2024031020:2500,2024031021:2348,2024031022:2061,2024031023:1253,2024031100:659,2024031101:243,2024031102:191,2024031103:282,2024031104:246,2024031105:439,2024031106:1079,2024031107:1911,2024031108:2023,2024031109:1432,2024031110:1632,2024031111:1183,2024031112:1024,2024031113:938,2024031114:701,2024031115:541";
 
-//        String up2 = "2024031012:215,2024031013:242,2024031014:166,2024031015:194,2024031016:209,2024031017:245,2024031018:320,2024031019:332,2024031020:400,2024031021:375,2024031022:636,2024031023:316,2024031100:167,2024031101:45,2024031102:22,2024031103:26,2024031104:12,2024031105:22,2024031106:24,2024031107:143,2024031108:181,2024031109:199,2024031110:194,2024031111:330,2024031112:423,2024031113:421,2024031114:497,2024031115:424";
-        String up2 = "2024031012:409,2024031013:464,2024031014:354,2024031015:474,2024031016:436,2024031017:636,2024031018:709,2024031019:741,2024031020:802,2024031021:904,2024031022:1112,2024031023:639,2024031100:378,2024031101:78,2024031102:47,2024031103:37,2024031104:17,2024031105:49,2024031106:103,2024031107:293,2024031108:457,2024031109:488,2024031110:558,2024031111:711,2024031112:785,2024031113:830,2024031114:974,2024031115:850";
-        String down2 = "2024031012:748,2024031013:886,2024031014:788,2024031015:1029,2024031016:957,2024031017:1170,2024031018:1208,2024031019:1181,2024031020:1275,2024031021:1265,2024031022:1512,2024031023:1190,2024031100:1127,2024031101:486,2024031102:289,2024031103:254,2024031104:197,2024031105:310,2024031106:344,2024031107:693,2024031108:976,2024031109:1045,2024031110:1039,2024031111:1257,2024031112:1202,2024031113:1454,2024031114:1785,2024031115:1544";
-
-        RankStrategy4RegionMergeModelV563 job = new RankStrategy4RegionMergeModelV563();
-        List<Double> l1 = job.getRateData(job.help(up1, "2024031115", 24), job.help(down1, "2024031115", 24), 1., 10.);
-        Double d1 = job.calScoreWeightNoTimeDecay(l1);
-
-        System.out.println(d1);
-
-        List<Double> l2 = job.getRateData(job.help(up2, "2024031115", 24), job.help(down2, "2024031115", 24), 1., 10.);
-        Double d2 = job.calScoreWeightNoTimeDecay(l2);
+    public static void main(String[] args) {
 
-        System.out.println(d2);
 
     }
 
-    List<Double> help(String s, String date, Integer h) {
-        Map<String, Double> maps = Arrays.stream(s.split(",")).map(pair -> pair.split(":"))
-                .collect(Collectors.toMap(
-                        arr -> arr[0],
-                        arr -> Double.valueOf(arr[1])
-                ));
-        List<String> datehours = new LinkedList<>(); // 时间是倒叙的
-        List<Double> result = new ArrayList<>();
-        for (int i = 0; i < h; ++i) {
-            Double d = (result.isEmpty() ? 0.0 : result.get(result.size() - 1));
-            result.add(d + maps.getOrDefault(date, 0D));
-            datehours.add(date);
-            date = ExtractorUtils.subtractHours(date, 1);
-        }
-        return result;
-    }
+
 
 }

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

@@ -74,39 +74,47 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
         oldRovs.addAll(extractAndSort(param, RegionRelative24HDupRecallStrategy.PUSH_FORM));
         int sizeReturn = param.getSize();
         removeDuplicate(oldRovs);
-        oldRovs = oldRovs.size() <= sizeReturn
+        List<Video> v0 = oldRovs.size() <= sizeReturn
                 ? oldRovs
                 : oldRovs.subList(0, sizeReturn);
-        Set<Long> setVideo = new HashSet<>();
-        this.duplicate(setVideo, oldRovs);
 
         //-------------------地域相关召回 融合+去重-------------------
-        List<Video> rovRecallRank = new ArrayList<>();
         List<Video> v1 = extractAndSort(param, RegionRealtimeRecallStrategyV1.PUSH_FORM);
-        List<Video> v2 = extractAndSort(param, RegionRealtimeRecallStrategyV2.PUSH_FORM);
+        List<Video> v2 = extractAndSort(param, RegionRealtimeRecallStrategyV2_sort.PUSH_FORM);
         List<Video> v3 = extractAndSort(param, RegionRealtimeRecallStrategyV3.PUSH_FORM);
         List<Video> v4 = extractAndSort(param, RegionRealtimeRecallStrategyV4.PUSH_FORM);
-        this.duplicate(setVideo, v1);
-        this.duplicate(setVideo, v2);
-        this.duplicate(setVideo, v3);
-        this.duplicate(setVideo, v4);
         //-------------------相关性召回 融合+去重-------------------
         List<Video> v5 = extractAndSort(param, SimHotVideoRecallStrategy.PUSH_FORM);
         List<Video> v6 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
-        this.duplicate(setVideo, v5);
-        this.duplicate(setVideo, v6);
         //-------------------节日扶持召回 融合+去重-------------------
         List<Video> v7 = extractAndSort(param, FestivalRecallStrategyV1.PUSH_FORM);
+        //-------------------流量池回捞-------------------
+        List<Video> v9 = extractAndSort(param, FlowPoolLastDayTopRecallStrategy.PUSH_FORM);
+
+        // 去重
+        Set<Long> setVideo = new HashSet<>();
+        this.duplicate(setVideo, v0);
+        this.duplicate(setVideo, v5);
+        this.duplicate(setVideo, v6);
+        this.duplicate(setVideo, v4);
+        this.duplicate(setVideo, v3);
+        this.duplicate(setVideo, v2);
+        this.duplicate(setVideo, v9);
+        this.duplicate(setVideo, v1);
         this.duplicate(setVideo, v7);
 
-        rovRecallRank.addAll(oldRovs);
-        rovRecallRank.addAll(v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 20.0).intValue(), v1.size())));
+
+
+        List<Video> rovRecallRank = new ArrayList<>();
+        rovRecallRank.addAll(v0);
+        rovRecallRank.addAll(v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 25.0).intValue(), v1.size())));
         rovRecallRank.addAll(v2.subList(0, Math.min(mergeWeight.getOrDefault("v2", 15.0).intValue(), v2.size())));
         rovRecallRank.addAll(v3.subList(0, Math.min(mergeWeight.getOrDefault("v3", 10.0).intValue(), v3.size())));
-        rovRecallRank.addAll(v4.subList(0, Math.min(mergeWeight.getOrDefault("v4", 0.0).intValue(), v4.size())));
-        rovRecallRank.addAll(v5.subList(0, Math.min(mergeWeight.getOrDefault("v5", 10.0).intValue(), v5.size())));
-        rovRecallRank.addAll(v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 10.0).intValue(), v6.size())));
-        rovRecallRank.addAll(v7.subList(0, Math.min(mergeWeight.getOrDefault("v7", 10.0).intValue(), v7.size())));
+        rovRecallRank.addAll(v4.subList(0, Math.min(mergeWeight.getOrDefault("v4", 5.0).intValue(), v4.size())));
+        rovRecallRank.addAll(v5.subList(0, Math.min(mergeWeight.getOrDefault("v5", 5.0).intValue(), v5.size())));
+        rovRecallRank.addAll(v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 5.0).intValue(), v6.size())));
+        rovRecallRank.addAll(v7.subList(0, Math.min(mergeWeight.getOrDefault("v7", 5.0).intValue(), v7.size())));
+        rovRecallRank.addAll(v9.subList(0, Math.min(mergeWeight.getOrDefault("v9", 5.0).intValue(), v9.size())));
 
         //-------------------排-------------------
         //-------------------序-------------------
@@ -116,22 +124,16 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
         // 1 模型分
         List<String> rtFeaPart = new ArrayList<>();
         List<RankItem> items = model(rovRecallRank, param, rtFeaPart);
-        List<String> rtFeaPartKey = new ArrayList<>(Arrays.asList("item_rt_fea_1day_partition",
-                "item_rt_fea_1h_partition",
-                "item_rt_fea_1hroot_partition"));
+        List<String> rtFeaPartKey = new ArrayList<>(Arrays.asList("item_rt_fea_1day_partition", "item_rt_fea_1h_partition"));
         List<String> rtFeaPartKeyResult = this.redisTemplate.opsForValue().multiGet(rtFeaPartKey);
         Calendar calendar = Calendar.getInstance();
         String date = new SimpleDateFormat("yyyyMMdd").format(calendar.getTime());
         String hour = new SimpleDateFormat("HH").format(calendar.getTime());
         String rtFeaPart1h = date + hour;
-        String rtFeaPart1hRoot = date + hour;
         if (rtFeaPartKeyResult != null) {
             if (rtFeaPartKeyResult.get(1) != null) {
                 rtFeaPart1h = rtFeaPartKeyResult.get(1);
             }
-            if (rtFeaPartKeyResult.get(2) != null) {
-                rtFeaPart1hRoot = rtFeaPartKeyResult.get(2);
-            }
         }
         // 2 统计分
         String cur = rtFeaPart1h;
@@ -140,11 +142,9 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
             datehours.add(cur);
             cur = ExtractorUtils.subtractHours(cur, 1);
         }
-        cur = rtFeaPart1hRoot;
-        List<String> datehoursRoot = new LinkedList<>(); // 时间是倒叙的
+        List<String> datehoursRoot = new LinkedList<>();
         for (int i = 0; i < 24; ++i) {
-            datehoursRoot.add(cur);
-            cur = ExtractorUtils.subtractHours(cur, 1);
+            datehoursRoot.add(String.valueOf(i+1));
         }
         // 2.1 item特征提取
         this.getVideoFeatureFromRedis(items);
@@ -152,31 +152,15 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
 
         for (RankItem item : items) {
             Map<String, Map<String, Double>> itemRealRootMap = item.getItemRealTimeRootFeature();
-            List<Double> return_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return");
-            Double returnScore_20240408 = calScoreWeightNoTimeDecay(return_20240408);
-            item.scoresMap.put("returnScore_20240408", returnScore_20240408);
-            List<Double> views_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "view");
-            List<Double> share_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "share");
-            List<Double> return1_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return1");
-            List<Double> return2_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return2");
-            List<Double> return3_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return3");
-            List<Double> return4_20240408 = getStaticData(itemRealRootMap, datehoursRoot, "return4");
-            List<Double> return12_20240408 = this.merge2List(return1_20240408, return2_20240408);
-            List<Double> rov_20240408 = getRateData(return12_20240408, views_20240408, 0.0, 0.0);
-            Double rovScore_20240408 = calScoreWeightNoTimeDecay(rov_20240408);
-            List<Double> ros_20240408 = getRateData(return12_20240408, share_20240408, 1.0, 10.0);
-            Double rosScore_20240408 = calScoreWeightNoTimeDecay(ros_20240408);
-            item.scoresMap.put("rovScore_20240408", rovScore_20240408);
-            item.scoresMap.put("rosScore_20240408", rosScore_20240408);
-
-
-            List<Double> fissionList =  getRateData(
-                    this.merge2List(return2_20240408, return4_20240408),
-                    this.merge2List(return1_20240408, return3_20240408),
-                    1.0, 1000.0
-            );
-            Double fissionScore = calScoreWeightNoTimeDecay(fissionList);
-            item.scoresMap.put("fissionScore", fissionScore);
+            List<Double> views_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "exp");
+            List<Double> share_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "share");
+            List<Double> return_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "return");
+            List<Double> rov_20240410 = getRateData(return_20240410, views_20240410, 0.0, 0.0);
+            Double rovScore_20240410 = calScoreWeightNoTimeDecay(rov_20240410);
+            List<Double> ros_20240410 = getRateData(return_20240410, share_20240410, 1.0, 10.0);
+            Double rosScore_20240410 = calScoreWeightNoTimeDecay(ros_20240410);
+            item.scoresMap.put("rovScore_20240410", rovScore_20240410);
+            item.scoresMap.put("rosScore_20240410", rosScore_20240410);
 
             Map<String, Map<String, Double>> itemRealMap = item.getItemRealTimeFeature();
             List<Double> views = getStaticData(itemRealMap, datehours, "view_pv_list_1h");
@@ -226,15 +210,15 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
         }
         // 3 融合公式
         List<Video> result = new ArrayList<>();
-        double a = mergeWeight.getOrDefault("a", 0.01);
+        double a = mergeWeight.getOrDefault("a", 0.1);
         double b = mergeWeight.getOrDefault("b", 0.0);
-        double c = mergeWeight.getOrDefault("c", 0.001);
-        double d = mergeWeight.getOrDefault("d", 0.01);
-        double e = mergeWeight.getOrDefault("e", 0.03);
-        double f = mergeWeight.getOrDefault("f", 0.2);
+        double c = mergeWeight.getOrDefault("c", 0.000001);
+        double d = mergeWeight.getOrDefault("d", 1.0);
+        double e = mergeWeight.getOrDefault("e", 1.0);
+        double f = mergeWeight.getOrDefault("f", 0.1);
         double g = mergeWeight.getOrDefault("g", 2.0);
-        double h = mergeWeight.getOrDefault("h", 240.0);
-        double m = mergeWeight.getOrDefault("m", 0.1);
+        double h = mergeWeight.getOrDefault("h", 5.0);
+        double ifAdd = mergeWeight.getOrDefault("ifAdd", 1.0);
         for (RankItem item : items) {
             double trendScore = item.scoresMap.getOrDefault("trendScore", 0.0) > 1E-8 ?
                     item.scoresMap.getOrDefault("trendScore", 0.0) : 0.0;
@@ -245,19 +229,22 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
             double share2allreturnScore = item.scoresMap.getOrDefault("share2allreturnScore", 0.0);
             double view2allreturnScore = item.scoresMap.getOrDefault("view2allreturnScore", 0.0);
             double preturnsScore = Math.log(1 + item.scoresMap.getOrDefault("preturnsScore", 0.0));
-            double returnScore_20240408 = Math.log(1 + item.scoresMap.getOrDefault("returnScore_20240408", 0.0));
-            double rovScore_20240408 = item.scoresMap.getOrDefault("rovScore_20240408", 0.0);
-            double rosScore_20240408 = item.scoresMap.getOrDefault("rosScore_20240408", 0.0);
+            double rovScore_20240410 = item.scoresMap.getOrDefault("rovScore_20240410", 0.0);
+            double rosScore_20240410 = item.scoresMap.getOrDefault("rosScore_20240410", 0.0);
+
             double score = 0.0;
-            score = a * strScore + b * rosScore + c * returnScore_20240408;
+            if (ifAdd < 0.5) {
+                score = Math.pow(strScore, a) * Math.pow(rosScore, b) + c * preturnsScore +
+                        (newVideoScore > 1E-8 ? d * trendScore * (e + newVideoScore) : 0.0);
+            } else {
+                score = a * strScore + b * rosScore + c * preturnsScore +
+                        (newVideoScore > 1E-8 ? d * trendScore * (e + newVideoScore) : 0.0);
+
+            }
             double allreturnsScore = item.scoresMap.getOrDefault("allreturnsScore", 0.0);
             if (allreturnsScore > h) {
-                score += (d * trendScore + e * newVideoScore);
-                score += (f * rosScore_20240408 + g * rovScore_20240408);
+                score += (f * rosScore_20240410 + g * rovScore_20240410);
             }
-            double fissionScore = item.scoresMap.getOrDefault("fissionScore", 0.0);
-            score += m * fissionScore;
-
             Video video = item.getVideo();
             video.setScore(score);
             video.setSortScore(score);
@@ -265,16 +252,16 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
             video.setScoresMap(item.getScoresMap());
             result.add(video);
         }
-        result.sort(Comparator.comparingDouble(o -> -o.getSortScore()));
+        Collections.sort(result, Comparator.comparingDouble(o -> -o.getSortScore()));
         return result;
     }
 
     public double calNewVideoScore(Map<String, String> itemBasicMap) {
         double existenceDays = Double.valueOf(itemBasicMap.getOrDefault("existence_days", "30"));
-        if (existenceDays >= 10) {
+        if (existenceDays > 5) {
             return 0.0;
         }
-        double score = 1 / (existenceDays + 1.0);
+        double score = 1.0 / (existenceDays + 10.0);
         return score;
     }
 
@@ -656,7 +643,7 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
 
     private void getVideoFeatureFromRedis(List<RankItem> items){
         List<Long> videoIds = CommonCollectionUtils.toListDistinct(items, RankItem::getVideoId);
-        List<String> videoKeys = videoIds.stream().map(r -> "item_rt_fea_1hroot_" + r)
+        List<String> videoKeys = videoIds.stream().map(r -> "item_rt_fea_1hrootall_" + r)
                 .collect(Collectors.toList());
         List<String> videoRtFeatures = this.redisTemplate.opsForValue().multiGet(videoKeys);
         int j = 0;
@@ -687,57 +674,18 @@ public class RankStrategy4RegionMergeModelV564 extends RankService {
                     }
                     item.setItemRealTimeRootFeature(vfMapNew);
                 } catch (Exception e) {
-                    log.error(String.format("parse video item_rt_fea_1hroot_ json is wrong in {} with {}", this.CLASS_NAME, e));
+                    log.error(String.format("parse video item_rt_fea_1hrootall_ json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
             }
         }
     }
-    private List<Double> merge2List(List<Double> a, List<Double> b){
-        int size = a.size();
-        List<Double> result = new ArrayList<>(size);
-        for (int i = 0; i < size; ++i){
-            result.add(a.get(i) + b.get(i));
-        }
-        return result;
-    }
 
-    public static void main(String[] args) {
-//        String up1 = "2024031012:513,2024031013:456,2024031014:449,2024031015:262,2024031016:414,2024031017:431,2024031018:643,2024031019:732,2024031020:927,2024031021:859,2024031022:866,2024031023:358,2024031100:133,2024031101:28,2024031102:22,2024031103:15,2024031104:21,2024031105:36,2024031106:157,2024031107:371,2024031108:378,2024031109:216,2024031110:269,2024031111:299,2024031112:196,2024031113:186,2024031114:85,2024031115:82";
-        String up1 = "2024031012:1167,2024031013:1023,2024031014:947,2024031015:664,2024031016:842,2024031017:898,2024031018:1170,2024031019:1439,2024031020:2010,2024031021:1796,2024031022:1779,2024031023:722,2024031100:226,2024031101:50,2024031102:31,2024031103:30,2024031104:38,2024031105:63,2024031106:293,2024031107:839,2024031108:1250,2024031109:858,2024031110:767,2024031111:697,2024031112:506,2024031113:534,2024031114:381,2024031115:278";
-        String down1 = "2024031012:2019,2024031013:1676,2024031014:1626,2024031015:1458,2024031016:1508,2024031017:1510,2024031018:1713,2024031019:1972,2024031020:2500,2024031021:2348,2024031022:2061,2024031023:1253,2024031100:659,2024031101:243,2024031102:191,2024031103:282,2024031104:246,2024031105:439,2024031106:1079,2024031107:1911,2024031108:2023,2024031109:1432,2024031110:1632,2024031111:1183,2024031112:1024,2024031113:938,2024031114:701,2024031115:541";
-
-//        String up2 = "2024031012:215,2024031013:242,2024031014:166,2024031015:194,2024031016:209,2024031017:245,2024031018:320,2024031019:332,2024031020:400,2024031021:375,2024031022:636,2024031023:316,2024031100:167,2024031101:45,2024031102:22,2024031103:26,2024031104:12,2024031105:22,2024031106:24,2024031107:143,2024031108:181,2024031109:199,2024031110:194,2024031111:330,2024031112:423,2024031113:421,2024031114:497,2024031115:424";
-        String up2 = "2024031012:409,2024031013:464,2024031014:354,2024031015:474,2024031016:436,2024031017:636,2024031018:709,2024031019:741,2024031020:802,2024031021:904,2024031022:1112,2024031023:639,2024031100:378,2024031101:78,2024031102:47,2024031103:37,2024031104:17,2024031105:49,2024031106:103,2024031107:293,2024031108:457,2024031109:488,2024031110:558,2024031111:711,2024031112:785,2024031113:830,2024031114:974,2024031115:850";
-        String down2 = "2024031012:748,2024031013:886,2024031014:788,2024031015:1029,2024031016:957,2024031017:1170,2024031018:1208,2024031019:1181,2024031020:1275,2024031021:1265,2024031022:1512,2024031023:1190,2024031100:1127,2024031101:486,2024031102:289,2024031103:254,2024031104:197,2024031105:310,2024031106:344,2024031107:693,2024031108:976,2024031109:1045,2024031110:1039,2024031111:1257,2024031112:1202,2024031113:1454,2024031114:1785,2024031115:1544";
-
-        RankStrategy4RegionMergeModelV564 job = new RankStrategy4RegionMergeModelV564();
-        List<Double> l1 = job.getRateData(job.help(up1, "2024031115", 24), job.help(down1, "2024031115", 24), 1., 10.);
-        Double d1 = job.calScoreWeightNoTimeDecay(l1);
 
-        System.out.println(d1);
-
-        List<Double> l2 = job.getRateData(job.help(up2, "2024031115", 24), job.help(down2, "2024031115", 24), 1., 10.);
-        Double d2 = job.calScoreWeightNoTimeDecay(l2);
+    public static void main(String[] args) {
 
-        System.out.println(d2);
 
     }
 
-    List<Double> help(String s, String date, Integer h) {
-        Map<String, Double> maps = Arrays.stream(s.split(",")).map(pair -> pair.split(":"))
-                .collect(Collectors.toMap(
-                        arr -> arr[0],
-                        arr -> Double.valueOf(arr[1])
-                ));
-        List<String> datehours = new LinkedList<>(); // 时间是倒叙的
-        List<Double> result = new ArrayList<>();
-        for (int i = 0; i < h; ++i) {
-            Double d = (result.isEmpty() ? 0.0 : result.get(result.size() - 1));
-            result.add(d + maps.getOrDefault(date, 0D));
-            datehours.add(date);
-            date = ExtractorUtils.subtractHours(date, 1);
-        }
-        return result;
-    }
+
 
 }

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

@@ -74,39 +74,47 @@ public class RankStrategy4RegionMergeModelV565 extends RankService {
         oldRovs.addAll(extractAndSort(param, RegionRelative24HDupRecallStrategy.PUSH_FORM));
         int sizeReturn = param.getSize();
         removeDuplicate(oldRovs);
-        oldRovs = oldRovs.size() <= sizeReturn
+        List<Video> v0 = oldRovs.size() <= sizeReturn
                 ? oldRovs
                 : oldRovs.subList(0, sizeReturn);
-        Set<Long> setVideo = new HashSet<>();
-        this.duplicate(setVideo, oldRovs);
 
         //-------------------地域相关召回 融合+去重-------------------
-        List<Video> rovRecallRank = new ArrayList<>();
         List<Video> v1 = extractAndSort(param, RegionRealtimeRecallStrategyV1.PUSH_FORM);
-        List<Video> v2 = extractAndSort(param, RegionRealtimeRecallStrategyV2.PUSH_FORM);
+        List<Video> v2 = extractAndSort(param, RegionRealtimeRecallStrategyV2_sort.PUSH_FORM);
         List<Video> v3 = extractAndSort(param, RegionRealtimeRecallStrategyV3.PUSH_FORM);
         List<Video> v4 = extractAndSort(param, RegionRealtimeRecallStrategyV4.PUSH_FORM);
-        this.duplicate(setVideo, v1);
-        this.duplicate(setVideo, v2);
-        this.duplicate(setVideo, v3);
-        this.duplicate(setVideo, v4);
         //-------------------相关性召回 融合+去重-------------------
         List<Video> v5 = extractAndSort(param, SimHotVideoRecallStrategy.PUSH_FORM);
         List<Video> v6 = extractAndSort(param, ReturnVideoRecallStrategy.PUSH_FORM);
-        this.duplicate(setVideo, v5);
-        this.duplicate(setVideo, v6);
         //-------------------节日扶持召回 融合+去重-------------------
         List<Video> v7 = extractAndSort(param, FestivalRecallStrategyV1.PUSH_FORM);
+        //-------------------流量池回捞-------------------
+        List<Video> v9 = extractAndSort(param, FlowPoolLastDayTopRecallStrategy.PUSH_FORM);
+
+        // 去重
+        Set<Long> setVideo = new HashSet<>();
+        this.duplicate(setVideo, v0);
+        this.duplicate(setVideo, v5);
+        this.duplicate(setVideo, v6);
+        this.duplicate(setVideo, v4);
+        this.duplicate(setVideo, v3);
+        this.duplicate(setVideo, v2);
+        this.duplicate(setVideo, v9);
+        this.duplicate(setVideo, v1);
         this.duplicate(setVideo, v7);
 
-        rovRecallRank.addAll(oldRovs);
-        rovRecallRank.addAll(v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 20.0).intValue(), v1.size())));
+
+
+        List<Video> rovRecallRank = new ArrayList<>();
+        rovRecallRank.addAll(v0);
+        rovRecallRank.addAll(v1.subList(0, Math.min(mergeWeight.getOrDefault("v1", 25.0).intValue(), v1.size())));
         rovRecallRank.addAll(v2.subList(0, Math.min(mergeWeight.getOrDefault("v2", 15.0).intValue(), v2.size())));
         rovRecallRank.addAll(v3.subList(0, Math.min(mergeWeight.getOrDefault("v3", 10.0).intValue(), v3.size())));
-        rovRecallRank.addAll(v4.subList(0, Math.min(mergeWeight.getOrDefault("v4", 0.0).intValue(), v4.size())));
-        rovRecallRank.addAll(v5.subList(0, Math.min(mergeWeight.getOrDefault("v5", 10.0).intValue(), v5.size())));
-        rovRecallRank.addAll(v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 10.0).intValue(), v6.size())));
-        rovRecallRank.addAll(v7.subList(0, Math.min(mergeWeight.getOrDefault("v7", 10.0).intValue(), v7.size())));
+        rovRecallRank.addAll(v4.subList(0, Math.min(mergeWeight.getOrDefault("v4", 5.0).intValue(), v4.size())));
+        rovRecallRank.addAll(v5.subList(0, Math.min(mergeWeight.getOrDefault("v5", 5.0).intValue(), v5.size())));
+        rovRecallRank.addAll(v6.subList(0, Math.min(mergeWeight.getOrDefault("v6", 5.0).intValue(), v6.size())));
+        rovRecallRank.addAll(v7.subList(0, Math.min(mergeWeight.getOrDefault("v7", 5.0).intValue(), v7.size())));
+        rovRecallRank.addAll(v9.subList(0, Math.min(mergeWeight.getOrDefault("v9", 5.0).intValue(), v9.size())));
 
         //-------------------排-------------------
         //-------------------序-------------------
@@ -134,108 +142,39 @@ public class RankStrategy4RegionMergeModelV565 extends RankService {
             datehours.add(cur);
             cur = ExtractorUtils.subtractHours(cur, 1);
         }
-        List<String> datehoursRoot = new LinkedList<>();
-        for (int i = 0; i < 24; ++i) {
-            datehoursRoot.add(String.valueOf(i+1));
-        }
-        // 2.1 item特征提取
-        this.getVideoFeatureFromRedis(items);
-
-
         for (RankItem item : items) {
-            Map<String, Map<String, Double>> itemRealRootMap = item.getItemRealTimeRootFeature();
-            List<Double> views_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "exp");
-            List<Double> share_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "share");
-            List<Double> return_20240410 = getStaticData(itemRealRootMap, datehoursRoot, "return");
-            List<Double> rov_20240410 = getRateData(return_20240410, views_20240410, 0.0, 0.0);
-            Double rovScore_20240410 = calScoreWeightNoTimeDecay(rov_20240410);
-            List<Double> ros_20240410 = getRateData(return_20240410, share_20240410, 1.0, 10.0);
-            Double rosScore_20240410 = calScoreWeightNoTimeDecay(ros_20240410);
-            item.scoresMap.put("rovScore_20240410", rovScore_20240410);
-            item.scoresMap.put("rosScore_20240410", rosScore_20240410);
-
             Map<String, Map<String, Double>> itemRealMap = item.getItemRealTimeFeature();
-            List<Double> views = getStaticData(itemRealMap, datehours, "view_pv_list_1h");
-            List<Double> plays = getStaticData(itemRealMap, datehours, "play_pv_list_1h");
-            List<Double> shares = getStaticData(itemRealMap, datehours, "share_pv_list_1h");
-            List<Double> preturns = getStaticData(itemRealMap, datehours, "p_return_uv_list_1h");
+            List<Double> views = getStaticData(itemRealMap, datehours, "view_uv_list_1h");
+            List<Double> shares = getStaticData(itemRealMap, datehours, "share_uv_list_1h");
             List<Double> allreturns = getStaticData(itemRealMap, datehours, "return_uv_list_1h");
 
-            List<Double> share2return = getRateData(preturns, shares, 1.0, 1000.0);
-            Double share2returnScore = calScoreWeightNoTimeDecay(share2return);
-            List<Double> view2return = getRateData(preturns, views, 1.0, 1000.0);
-            Double view2returnScore = calScoreWeightNoTimeDecay(view2return);
-            List<Double> view2play = getRateData(plays, views, 1.0, 1000.0);
-            Double view2playScore = calScoreWeightNoTimeDecay(view2play);
-            List<Double> play2share = getRateData(shares, plays, 1.0, 1000.0);
-            Double play2shareScore = calScoreWeightNoTimeDecay(play2share);
-            item.scoresMap.put("share2returnScore", share2returnScore);
-            item.scoresMap.put("view2returnScore", view2returnScore);
-            item.scoresMap.put("view2playScore", view2playScore);
-            item.scoresMap.put("play2shareScore", play2shareScore);
-
             // 全部回流的rov和ros
-            List<Double> share2allreturn = getRateData(allreturns, shares, 1.0, 10.0);
+            List<Double> share2allreturn = getRateData(allreturns, shares, 0.0, 0.0);
             Double share2allreturnScore = calScoreWeightNoTimeDecay(share2allreturn);
+            item.scoresMap.put("share2allreturnScore", share2allreturnScore);
             List<Double> view2allreturn = getRateData(allreturns, views, 0.0, 0.0);
             Double view2allreturnScore = calScoreWeightNoTimeDecay(view2allreturn);
-            item.scoresMap.put("share2allreturnScore", share2allreturnScore);
             item.scoresMap.put("view2allreturnScore", view2allreturnScore);
 
             // 全部回流
             Double allreturnsScore = calScoreWeightNoTimeDecay(allreturns);
             item.scoresMap.put("allreturnsScore", allreturnsScore);
 
-            // 平台回流
-            Double preturnsScore = calScoreWeightNoTimeDecay(preturns);
-            item.scoresMap.put("preturnsScore", preturnsScore);
-
-            // rov的趋势
-            double trendScore = calTrendScore(view2return);
-            item.scoresMap.put("trendScore", trendScore);
-
-            // 新视频提取
-            Map<String, String> itemBasicMap = item.getItemBasicFeature();
-            double newVideoScore = calNewVideoScore(itemBasicMap);
-            item.scoresMap.put("newVideoScore", newVideoScore);
 
         }
         // 3 融合公式
         List<Video> result = new ArrayList<>();
-        double a = mergeWeight.getOrDefault("a", 0.1);
-        double b = mergeWeight.getOrDefault("b", 0.0);
-        double c = mergeWeight.getOrDefault("c", 0.000001);
-        double d = mergeWeight.getOrDefault("d", 1.0);
-        double e = mergeWeight.getOrDefault("e", 1.0);
         double f = mergeWeight.getOrDefault("f", 0.1);
         double g = mergeWeight.getOrDefault("g", 1.0);
-        double h = mergeWeight.getOrDefault("h", 240.0);
-        double ifAdd = mergeWeight.getOrDefault("ifAdd", 1.0);
         for (RankItem item : items) {
-            double trendScore = item.scoresMap.getOrDefault("trendScore", 0.0) > 1E-8 ?
-                    item.scoresMap.getOrDefault("trendScore", 0.0) : 0.0;
-            double newVideoScore = item.scoresMap.getOrDefault("newVideoScore", 0.0) > 1E-8 ?
-                    item.scoresMap.getOrDefault("newVideoScore", 0.0) : 0.0;
-            double strScore = item.getScoreStr();
-            double rosScore = item.scoresMap.getOrDefault("share2returnScore", 0.0);
             double share2allreturnScore = item.scoresMap.getOrDefault("share2allreturnScore", 0.0);
             double view2allreturnScore = item.scoresMap.getOrDefault("view2allreturnScore", 0.0);
-            double preturnsScore = Math.log(1 + item.scoresMap.getOrDefault("preturnsScore", 0.0));
-            double rovScore_20240410 = item.scoresMap.getOrDefault("rovScore_20240410", 0.0);
-            double rosScore_20240410 = item.scoresMap.getOrDefault("rosScore_20240410", 0.0);
-
             double score = 0.0;
-            if (ifAdd < 0.5) {
-                score = Math.pow(strScore, a) * Math.pow(rosScore, b) + c * preturnsScore +
-                        (newVideoScore > 1E-8 ? d * trendScore * (e + newVideoScore) : 0.0);
-            } else {
-                score = a * strScore + b * rosScore + c * preturnsScore +
-                        (newVideoScore > 1E-8 ? d * trendScore * (e + newVideoScore) : 0.0);
-
-            }
             double allreturnsScore = item.scoresMap.getOrDefault("allreturnsScore", 0.0);
-            if (allreturnsScore > h) {
-                score += (f * rosScore_20240410 + g * rovScore_20240410);
+            if (allreturnsScore > 50) {
+                score += (f * share2allreturnScore + g * view2allreturnScore);
+            }else{
+                score += (f * share2allreturnScore + g * view2allreturnScore) * 0.01;
             }
             Video video = item.getVideo();
             video.setScore(score);
@@ -244,37 +183,10 @@ public class RankStrategy4RegionMergeModelV565 extends RankService {
             video.setScoresMap(item.getScoresMap());
             result.add(video);
         }
-        Collections.sort(result, Comparator.comparingDouble(o -> -o.getSortScore()));
+        result.sort(Comparator.comparingDouble(o -> -o.getSortScore()));
         return result;
     }
 
-    public double calNewVideoScore(Map<String, String> itemBasicMap) {
-        double existenceDays = Double.valueOf(itemBasicMap.getOrDefault("existence_days", "30"));
-        if (existenceDays > 5) {
-            return 0.0;
-        }
-        double score = 1.0 / (existenceDays + 10.0);
-        return score;
-    }
-
-    public double calTrendScore(List<Double> data) {
-        double sum = 0.0;
-        int size = data.size();
-        for (int i = 0; i < size - 4; ++i) {
-            sum += data.get(i) - data.get(i + 4);
-        }
-        if (sum * 10 > 0.6) {
-            sum = 0.6;
-        } else {
-            sum = sum * 10;
-        }
-        if (sum > 0) {
-            // 为了打断点
-            sum = sum;
-        }
-        return sum;
-    }
-
     public Double calScoreWeightNoTimeDecay(List<Double> data) {
         Double up = 0.0;
         Double down = 0.0;
@@ -318,165 +230,18 @@ public class RankStrategy4RegionMergeModelV565 extends RankService {
             return result;
         }
 
-        RedisStandaloneConfiguration redisSC = new RedisStandaloneConfiguration();
-        redisSC.setPort(6379);
-        redisSC.setPassword("Wqsd@2019");
-        redisSC.setHostName("r-bp1pi8wyv6lzvgjy5z.redis.rds.aliyuncs.com");
-        RedisConnectionFactory connectionFactory = new JedisConnectionFactory(redisSC);
-        RedisTemplate<String, String> redisTemplate = new RedisTemplate<>();
-        redisTemplate.setConnectionFactory(connectionFactory);
-        redisTemplate.setDefaultSerializer(new StringRedisSerializer());
-        redisTemplate.afterPropertiesSet();
-
-        // 0: 场景特征处理
-        Map<String, String> sceneFeatureMap = this.getSceneFeature(param);
-
-        // 1: user特征处理
-        Map<String, String> userFeatureMap = new HashMap<>();
-        if (param.getMid() != null && !param.getMid().isEmpty()) {
-            String midKey = "user_info_4video_" + param.getMid();
-            String userFeatureStr = redisTemplate.opsForValue().get(midKey);
-            if (userFeatureStr != null) {
-                try {
-                    userFeatureMap = JSONUtils.fromJson(userFeatureStr,
-                            new TypeToken<Map<String, String>>() {
-                            },
-                            userFeatureMap);
-                } catch (Exception e) {
-                    log.error(String.format("parse user json is wrong in {} with {}", this.CLASS_NAME, e));
-                }
-            }
-        }
-        final Set<String> userFeatureSet = new HashSet<>(Arrays.asList(
-                "machineinfo_brand", "machineinfo_model", "machineinfo_platform", "machineinfo_system",
-                "u_1day_exp_cnt", "u_1day_click_cnt", "u_1day_share_cnt", "u_1day_return_cnt",
-                "u_3day_exp_cnt", "u_3day_click_cnt", "u_3day_share_cnt", "u_3day_return_cnt"
-        ));
-        Iterator<Map.Entry<String, String>> iterator = userFeatureMap.entrySet().iterator();
-        while (iterator.hasNext()) {
-            Map.Entry<String, String> entry = iterator.next();
-            if (!userFeatureSet.contains(entry.getKey())) {
-                iterator.remove();
-            }
-        }
-
-        Map<String, String> f1 = RankExtractorUserFeature.getOriginFeature(userFeatureMap,
-                new HashSet<String>(Arrays.asList(
-                        "machineinfo_brand", "machineinfo_model", "machineinfo_platform", "machineinfo_system"
-                ))
-        );
-        Map<String, String> f2 = RankExtractorUserFeature.getUserRateFeature(userFeatureMap);
-        Map<String, String> f3 = RankExtractorUserFeature.cntFeatureChange(userFeatureMap,
-                new HashSet<String>(Arrays.asList(
-                        "u_1day_exp_cnt", "u_1day_click_cnt", "u_1day_share_cnt", "u_1day_return_cnt",
-                        "u_3day_exp_cnt", "u_3day_click_cnt", "u_3day_share_cnt", "u_3day_return_cnt"
-                ))
-        );
-        f1.putAll(f2);
-        f1.putAll(f3);
-
-        // 2-1: item特征处理
-        final Set<String> itemFeatureSet = new HashSet<>(Arrays.asList(
-                "total_time", "play_count_total",
-                "i_1day_exp_cnt", "i_1day_click_cnt", "i_1day_share_cnt", "i_1day_return_cnt",
-                "i_3day_exp_cnt", "i_3day_click_cnt", "i_3day_share_cnt", "i_3day_return_cnt"
-        ));
 
         List<RankItem> rankItems = CommonCollectionUtils.toList(videos, RankItem::new);
         List<Long> videoIds = CommonCollectionUtils.toListDistinct(videos, Video::getVideoId);
-        List<String> videoFeatureKeys = videoIds.stream().map(r -> "video_info_" + r)
-                .collect(Collectors.toList());
-        List<String> videoFeatures = redisTemplate.opsForValue().multiGet(videoFeatureKeys);
-        if (videoFeatures != null) {
-            for (int i = 0; i < videoFeatures.size(); ++i) {
-                String vF = videoFeatures.get(i);
-                Map<String, String> vfMap = new HashMap<>();
-                if (vF == null) {
-                    continue;
-                }
-                try {
-                    vfMap = JSONUtils.fromJson(vF, new TypeToken<Map<String, String>>() {
-                    }, vfMap);
-                    Map<String, String> vfMapCopy = new HashMap<>(vfMap);
-                    rankItems.get(i).setItemBasicFeature(vfMapCopy);
-                    Iterator<Map.Entry<String, String>> iteratorIn = vfMap.entrySet().iterator();
-                    while (iteratorIn.hasNext()) {
-                        Map.Entry<String, String> entry = iteratorIn.next();
-                        if (!itemFeatureSet.contains(entry.getKey())) {
-                            iteratorIn.remove();
-                        }
-                    }
-                    Map<String, String> f4 = RankExtractorItemFeature.getItemRateFeature(vfMap);
-                    Map<String, String> f5 = RankExtractorItemFeature.cntFeatureChange(vfMap,
-                            new HashSet<String>(Arrays.asList(
-                                    "total_time", "play_count_total",
-                                    "i_1day_exp_cnt", "i_1day_click_cnt", "i_1day_share_cnt", "i_1day_return_cnt",
-                                    "i_3day_exp_cnt", "i_3day_click_cnt", "i_3day_share_cnt", "i_3day_return_cnt"))
-                    );
-                    f4.putAll(f5);
-                    rankItems.get(i).setFeatureMap(f4);
-                } catch (Exception e) {
-                    log.error(String.format("parse video json is wrong in {} with {}", this.CLASS_NAME, e));
-                }
-            }
-        }
-        // 2-2: item 实时特征处理
-        List<String> rtFeaPartKey = new ArrayList<>(Arrays.asList("item_rt_fea_1day_partition", "item_rt_fea_1h_partition"));
-        List<String> rtFeaPartKeyResult = this.redisTemplate.opsForValue().multiGet(rtFeaPartKey);
-        Calendar calendar = Calendar.getInstance();
-        String date = new SimpleDateFormat("yyyyMMdd").format(calendar.getTime());
-        String hour = new SimpleDateFormat("HH").format(calendar.getTime());
-        String rtFeaPart1day = date + hour;
-        String rtFeaPart1h = date + hour;
-        if (rtFeaPartKeyResult != null) {
-            if (rtFeaPartKeyResult.get(0) != null) {
-                rtFeaPart1day = rtFeaPartKeyResult.get(0);
-            }
-            if (rtFeaPartKeyResult.get(1) != null) {
-                rtFeaPart1h = rtFeaPartKeyResult.get(1);
-            }
-        }
 
-        List<String> videoRtKeys1 = videoIds.stream().map(r -> "item_rt_fea_1day_" + r)
-                .collect(Collectors.toList());
+        // 2-2: item 实时特征处理
         List<String> videoRtKeys2 = videoIds.stream().map(r -> "item_rt_fea_1h_" + r)
                 .collect(Collectors.toList());
-        videoRtKeys1.addAll(videoRtKeys2);
-        List<String> videoRtFeatures = this.redisTemplate.opsForValue().multiGet(videoRtKeys1);
+        List<String> videoRtFeatures = this.redisTemplate.opsForValue().multiGet(videoRtKeys2);
 
 
         if (videoRtFeatures != null) {
             int j = 0;
-            for (RankItem item : rankItems) {
-                String vF = videoRtFeatures.get(j);
-                ++j;
-                if (vF == null) {
-                    continue;
-                }
-                Map<String, String> vfMap = new HashMap<>();
-                Map<String, Map<String, Double>> vfMapNew = new HashMap<>();
-                try {
-                    vfMap = JSONUtils.fromJson(vF, new TypeToken<Map<String, String>>() {
-                    }, vfMap);
-                    for (Map.Entry<String, String> entry : vfMap.entrySet()) {
-                        String value = entry.getValue();
-                        if (value == null) {
-                            continue;
-                        }
-                        String[] var1 = value.split(",");
-                        Map<String, Double> tmp = new HashMap<>();
-                        for (String var2 : var1) {
-                            String[] var3 = var2.split(":");
-                            tmp.put(var3[0], Double.valueOf(var3[1]));
-                        }
-                        vfMapNew.put(entry.getKey(), tmp);
-                    }
-                } catch (Exception e) {
-                    log.error(String.format("parse video item_rt_fea_1day_ json is wrong in {} with {}", this.CLASS_NAME, e));
-                }
-                Map<String, String> f8 = RankExtractorItemFeature.getItemRealtimeRate(vfMapNew, rtFeaPart1day);
-                item.getFeatureMap().putAll(f8);
-            }
             for (RankItem item : rankItems) {
                 String vF = videoRtFeatures.get(j);
                 ++j;
@@ -506,44 +271,10 @@ public class RankStrategy4RegionMergeModelV565 extends RankService {
                 } catch (Exception e) {
                     log.error(String.format("parse video item_rt_fea_1h_ json is wrong in {} with {}", this.CLASS_NAME, e));
                 }
-                Map<String, String> f8 = RankExtractorItemFeature.getItemRealtimeRate(vfMapNew, rtFeaPart1h);
-                item.getFeatureMap().putAll(f8);
             }
         }
 
-
-        List<RankItem> rovRecallScore = ScorerUtils.getScorerPipeline(ScorerUtils.BASE_CONF)
-                .scoring(sceneFeatureMap, userFeatureMap, rankItems);
-        return rovRecallScore;
-    }
-
-    private Map<String, String> getSceneFeature(RankParam param) {
-        Map<String, String> sceneFeatureMap = new HashMap<>();
-        String provinceCn = param.getProvince();
-        provinceCn = provinceCn.replaceAll("省$", "");
-        sceneFeatureMap.put("ctx_region", provinceCn);
-        String city = param.getCity();
-        if ("台北市".equals(city) |
-                "高雄市".equals(city) |
-                "台中市".equals(city) |
-                "桃园市".equals(city) |
-                "新北市".equals(city) |
-                "台南市".equals(city) |
-                "基隆市".equals(city) |
-                "吉林市".equals(city) |
-                "新竹市".equals(city) |
-                "嘉义市".equals(city)
-        ) {
-        } else {
-            city = city.replaceAll("市$", "");
-        }
-        sceneFeatureMap.put("ctx_city", city);
-
-        Calendar calendar = Calendar.getInstance();
-        sceneFeatureMap.put("ctx_week", (calendar.get(Calendar.DAY_OF_WEEK) + 6) % 7 + "");
-        sceneFeatureMap.put("ctx_hour", new SimpleDateFormat("HH").format(calendar.getTime()));
-
-        return sceneFeatureMap;
+        return rankItems;
     }
 
     @Override
@@ -633,82 +364,11 @@ public class RankStrategy4RegionMergeModelV565 extends RankService {
         return new RankResult(resultWithDensity);
     }
 
-    private void getVideoFeatureFromRedis(List<RankItem> items){
-        List<Long> videoIds = CommonCollectionUtils.toListDistinct(items, RankItem::getVideoId);
-        List<String> videoKeys = videoIds.stream().map(r -> "item_rt_fea_1hrootall_" + r)
-                .collect(Collectors.toList());
-        List<String> videoRtFeatures = this.redisTemplate.opsForValue().multiGet(videoKeys);
-        int j = 0;
-        if (videoRtFeatures != null) {
-            for (RankItem item : items) {
-                String vF = videoRtFeatures.get(j);
-                ++j;
-                if (vF == null) {
-                    continue;
-                }
-                Map<String, String> vfMap = new HashMap<>();
-                Map<String, Map<String, Double>> vfMapNew = new HashMap<>();
-                try {
-                    vfMap = JSONUtils.fromJson(vF, new TypeToken<Map<String, String>>() {
-                    }, vfMap);
-                    for (Map.Entry<String, String> entry : vfMap.entrySet()) {
-                        String value = entry.getValue();
-                        if (value == null) {
-                            continue;
-                        }
-                        String[] var1 = value.split(",");
-                        Map<String, Double> tmp = new HashMap<>();
-                        for (String var2 : var1) {
-                            String[] var3 = var2.split(":");
-                            tmp.put(var3[0], Double.valueOf(var3[1]));
-                        }
-                        vfMapNew.put(entry.getKey(), tmp);
-                    }
-                    item.setItemRealTimeRootFeature(vfMapNew);
-                } catch (Exception e) {
-                    log.error(String.format("parse video item_rt_fea_1hrootall_ json is wrong in {} with {}", this.CLASS_NAME, e));
-                }
-            }
-        }
-    }
-
     public static void main(String[] args) {
-//        String up1 = "2024031012:513,2024031013:456,2024031014:449,2024031015:262,2024031016:414,2024031017:431,2024031018:643,2024031019:732,2024031020:927,2024031021:859,2024031022:866,2024031023:358,2024031100:133,2024031101:28,2024031102:22,2024031103:15,2024031104:21,2024031105:36,2024031106:157,2024031107:371,2024031108:378,2024031109:216,2024031110:269,2024031111:299,2024031112:196,2024031113:186,2024031114:85,2024031115:82";
-        String up1 = "2024031012:1167,2024031013:1023,2024031014:947,2024031015:664,2024031016:842,2024031017:898,2024031018:1170,2024031019:1439,2024031020:2010,2024031021:1796,2024031022:1779,2024031023:722,2024031100:226,2024031101:50,2024031102:31,2024031103:30,2024031104:38,2024031105:63,2024031106:293,2024031107:839,2024031108:1250,2024031109:858,2024031110:767,2024031111:697,2024031112:506,2024031113:534,2024031114:381,2024031115:278";
-        String down1 = "2024031012:2019,2024031013:1676,2024031014:1626,2024031015:1458,2024031016:1508,2024031017:1510,2024031018:1713,2024031019:1972,2024031020:2500,2024031021:2348,2024031022:2061,2024031023:1253,2024031100:659,2024031101:243,2024031102:191,2024031103:282,2024031104:246,2024031105:439,2024031106:1079,2024031107:1911,2024031108:2023,2024031109:1432,2024031110:1632,2024031111:1183,2024031112:1024,2024031113:938,2024031114:701,2024031115:541";
 
-//        String up2 = "2024031012:215,2024031013:242,2024031014:166,2024031015:194,2024031016:209,2024031017:245,2024031018:320,2024031019:332,2024031020:400,2024031021:375,2024031022:636,2024031023:316,2024031100:167,2024031101:45,2024031102:22,2024031103:26,2024031104:12,2024031105:22,2024031106:24,2024031107:143,2024031108:181,2024031109:199,2024031110:194,2024031111:330,2024031112:423,2024031113:421,2024031114:497,2024031115:424";
-        String up2 = "2024031012:409,2024031013:464,2024031014:354,2024031015:474,2024031016:436,2024031017:636,2024031018:709,2024031019:741,2024031020:802,2024031021:904,2024031022:1112,2024031023:639,2024031100:378,2024031101:78,2024031102:47,2024031103:37,2024031104:17,2024031105:49,2024031106:103,2024031107:293,2024031108:457,2024031109:488,2024031110:558,2024031111:711,2024031112:785,2024031113:830,2024031114:974,2024031115:850";
-        String down2 = "2024031012:748,2024031013:886,2024031014:788,2024031015:1029,2024031016:957,2024031017:1170,2024031018:1208,2024031019:1181,2024031020:1275,2024031021:1265,2024031022:1512,2024031023:1190,2024031100:1127,2024031101:486,2024031102:289,2024031103:254,2024031104:197,2024031105:310,2024031106:344,2024031107:693,2024031108:976,2024031109:1045,2024031110:1039,2024031111:1257,2024031112:1202,2024031113:1454,2024031114:1785,2024031115:1544";
-
-        RankStrategy4RegionMergeModelV565 job = new RankStrategy4RegionMergeModelV565();
-        List<Double> l1 = job.getRateData(job.help(up1, "2024031115", 24), job.help(down1, "2024031115", 24), 1., 10.);
-        Double d1 = job.calScoreWeightNoTimeDecay(l1);
-
-        System.out.println(d1);
-
-        List<Double> l2 = job.getRateData(job.help(up2, "2024031115", 24), job.help(down2, "2024031115", 24), 1., 10.);
-        Double d2 = job.calScoreWeightNoTimeDecay(l2);
-
-        System.out.println(d2);
 
     }
 
-    List<Double> help(String s, String date, Integer h) {
-        Map<String, Double> maps = Arrays.stream(s.split(",")).map(pair -> pair.split(":"))
-                .collect(Collectors.toMap(
-                        arr -> arr[0],
-                        arr -> Double.valueOf(arr[1])
-                ));
-        List<String> datehours = new LinkedList<>(); // 时间是倒叙的
-        List<Double> result = new ArrayList<>();
-        for (int i = 0; i < h; ++i) {
-            Double d = (result.isEmpty() ? 0.0 : result.get(result.size() - 1));
-            result.add(d + maps.getOrDefault(date, 0D));
-            datehours.add(date);
-            date = ExtractorUtils.subtractHours(date, 1);
-        }
-        return result;
-    }
+
 
 }

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/RecallService.java

@@ -92,6 +92,15 @@ public class RecallService implements ApplicationContextAware {
             return strategies;
         } else {
             switch (abCode) {
+                case "60113": // 563
+                case "60114": // 564
+                case "60115": // 565
+                    strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
+                    strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV2_sort.class.getSimpleName()));
+                    strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV3.class.getSimpleName()));
+                    strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV4.class.getSimpleName()));
+                    strategies.addAll(getRegionRecallStrategy(param));
+                    break;
                 case "60105": // 551
                 case "60106": // 552
                 case "60107": // 553
@@ -114,9 +123,6 @@ public class RecallService implements ApplicationContextAware {
                 case "60124": // 546
                 case "60125": // 547
                 case "60126": // 548
-                case "60113": // 563
-                case "60114": // 564
-                case "60115": // 565
                 case "60116": // 566
                     strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV1.class.getSimpleName()));
                     strategies.add(strategyMap.get(RegionRealtimeRecallStrategyV2.class.getSimpleName()));
@@ -244,15 +250,15 @@ public class RecallService implements ApplicationContextAware {
                 case "60105": // 551
                 case "60106": // 552
                 case "60107": // 553
-                case "60113": // 563
-                case "60114": // 564
-                case "60115": // 565
                 case "60116": // 566
                 case "60119": // 569
                     strategies.add(strategyMap.get(SimHotVideoRecallStrategy.class.getSimpleName()));
                     strategies.add(strategyMap.get(ReturnVideoRecallStrategy.class.getSimpleName()));
                     strategies.add(strategyMap.get(FestivalRecallStrategyV1.class.getSimpleName()));
                     break;
+                case "60113": // 563
+                case "60114": // 564
+                case "60115": // 565
                 case "60117": // 567
                 case "60118": // 568
                     strategies.add(strategyMap.get(FlowPoolLastDayTopRecallStrategy.class.getSimpleName()));