Merge branch 'feature_refactor' of algorithm/recommend-server into master

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

@@ -65,10 +65,12 @@ public abstract class RankStrategy4RegionMergeModelBasic extends RankService {
         //2 根据实验号解析阿波罗参数。
         Set<String> abExpCodes = param.getAbExpCodes();
         Map<String, Map<String, String>> rulesMap = Collections.emptyMap();
-        for (Map.Entry<String, Map<String, Map<String, String>>> entry : this.filterRules.entrySet()) {
-            if (abExpCodes.contains(entry.getKey())) {
-                rulesMap = entry.getValue();
-                break;
+        if (CollectionUtils.isNotEmpty(abExpCodes)) {
+            for (Map.Entry<String, Map<String, Map<String, String>>> entry : this.filterRules.entrySet()) {
+                if (abExpCodes.contains(entry.getKey())) {
+                    rulesMap = entry.getValue();
+                    break;
+                }
             }
         }
 
@@ -144,7 +146,7 @@ public abstract class RankStrategy4RegionMergeModelBasic extends RankService {
         return new RankResult(resultWithDensity);
     }
 
-    public Map<String, Map<String, String>> getVideoRedisFeature(List<String> vids, String redisKeyPrefix){
+    public Map<String, Map<String, String>> getVideoRedisFeature(List<String> vids, String redisKeyPrefix) {
         List<String> keys = vids.stream().map(r -> redisKeyPrefix + r).collect(Collectors.toList());
         List<String> key2Values = this.redisTemplate.opsForValue().multiGet(keys);
         Map<String, Map<String, String>> result = new HashMap<>(vids.size());
@@ -158,7 +160,8 @@ public abstract class RankStrategy4RegionMergeModelBasic extends RankService {
                 }
                 Map<String, String> vfMap = new HashMap<>();
                 try {
-                    vfMap = JSONUtils.fromJson(vF, new TypeToken<Map<String, String>>() {}, vfMap);
+                    vfMap = JSONUtils.fromJson(vF, new TypeToken<Map<String, String>>() {
+                    }, vfMap);
                 } catch (Exception e) {
                     log.error(String.format("parse video json is wrong on redisKeyPrefix in {} with {}", this.CLASS_NAME, redisKeyPrefix));
                 }
@@ -207,12 +210,14 @@ public abstract class RankStrategy4RegionMergeModelBasic extends RankService {
         }
 
     }
-    protected double restoreScore(double score){
-        return (0.1 * score) / (1- 0.9 * score);
+
+    protected double restoreScore(double score) {
+        return (0.1 * score) / (1 - 0.9 * score);
     }
 
     Map<String, double[]> bucketsMap = new HashMap<>();
     Map<String, Double> bucketsLen = new HashMap<>();
+
     public void readBucketFile() {
         InputStream resourceStream = RankStrategy4RegionMergeModelBasic.class.getClassLoader().getResourceAsStream("20240609_bucket_274.txt");
         if (resourceStream != null) {