feat:长期个性化召回推全

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

@@ -150,32 +150,6 @@ public class RecallService implements ApplicationContextAware {
             strategies.add(strategyMap.get(UserDeconstructionKeywordsRecallStrategy.class.getSimpleName()));
         }
 
-<<<<<<< Updated upstream
-        boolean isHit568Exp = experimentService.judgeHitExp(param.getAppType(), param.getRootSessionId(), abExpCodes, "568");
-        if (isHit568Exp) {
-            strategies.add(strategyMap.get(YearShareCate1RecallStrategy.class.getSimpleName()));
-            strategies.add(strategyMap.get(YearShareCate2RecallStrategy.class.getSimpleName()));
-            strategies.add(strategyMap.get(YearReturnCate2RecallStrategy.class.getSimpleName()));
-=======
-        boolean isHit564Exp = experimentService.judgeHitExp(param.getAppType(), param.getRootSessionId(), abExpCodes, "564");
-        if (isHit564Exp) {
-            strategies.add(strategyMap.get(ProvinceRovnRecallStrategy.class.getSimpleName()));
-            // V564: rank 侧不再 extract 以下 9 路召回，这里直接剔除避免无效 Redis 调用
-            Set<String> v564RemoveSet = new HashSet<>(Arrays.asList(
-                    RegionRealtimeRecallStrategyV1.class.getSimpleName(),
-                    RegionHRecallStrategy.class.getSimpleName(),
-                    Region24HRecallStrategy.class.getSimpleName(),
-                    RegionHDupRecallStrategy.class.getSimpleName(),
-                    RegionRelative24HRecallStrategy.class.getSimpleName(),
-                    RegionRelative24HDupRecallStrategy.class.getSimpleName(),
-                    PrioriProvinceRovnRecallStrategy.class.getSimpleName(),
-                    PrioriProvinceStrRecallStrategy.class.getSimpleName(),
-                    PrioriProvinceRosRecallStrategy.class.getSimpleName()
-            ));
-            strategies.removeIf(s -> s != null && v564RemoveSet.contains(s.getClass().getSimpleName()));
->>>>>>> Stashed changes
-        }
-
         boolean isHit564Exp = experimentService.judgeHitExp(param.getAppType(), param.getRootSessionId(), abExpCodes, "564");
         if (isHit564Exp) {
             strategies.add(strategyMap.get(ProvinceRovnRecallStrategy.class.getSimpleName()));