增加本地缓存

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/container/AdCreativeFeatureContainer.java

@@ -81,22 +81,13 @@ public class AdCreativeFeatureContainer {
         log.info("svc=load_from_recommend_feature  idList={}", JSONObject.toJSONString(keyList));
         return result;
     }
-//    public Map<Long, AdRankItem>  getAll(List<Long> creativeIds) {
-//        try {
-//            return cache.getAll(creativeIds);
-//        } catch (Exception e) {
-//            log.error("get all failed {}", e);
-//        }
-//        return Collections.emptyMap();
-//    }
-
-    public List< AdRankItem>  getAll(List<Long> creativeIds) {
+    public Map<Long, AdRankItem>  getAll(List<Long> creativeIds) {
         try {
-            return cache.getAll(creativeIds).values().asList();
+            return cache.getAll(creativeIds);
         } catch (Exception e) {
             log.error("get all failed {}", e);
         }
-        return Collections.emptyList();
+        return Collections.emptyMap();
     }
 
     public AdRankItem get(Long creativeIds) {

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -66,16 +66,12 @@ public class RankServiceImpl implements RankService {
         }
 
 
-//        Map<Long, AdRankItem> cache=adCreativeFeatureContainer.getAll(request.getAdIdList());
-//        List<AdRankItem> rankItems=Collections.emptyList();
-//        if(!cache.isEmpty()){
-//            rankItems=new LinkedList<>(cache.values());
-//        }
-        List<AdRankItem> rankItems=adCreativeFeatureContainer.getAll(request.getAdIdList());
-//        List<AdRankItem> rankItems=Collections.emptyList();
-//        if(!cache.isEmpty()){
-//            rankItems=new LinkedList<>(cache.values());
-//        }
+        Map<Long, AdRankItem> cache=adCreativeFeatureContainer.getAll(request.getAdIdList());
+        List<AdRankItem> rankItems=Collections.emptyList();
+        if(!cache.isEmpty()){
+            rankItems=new LinkedList<>(cache.values());
+        }
+//        List<AdRankItem> rankItems=adCreativeFeatureContainer.getAll(request.getAdIdList());
 
 
         //避免recommend-feature出问题
@@ -144,12 +140,11 @@ public class RankServiceImpl implements RankService {
                 .collect(Collectors.groupingBy(creativeDTO -> creativeDTO.getCreativeId()));
 
 
-        List<AdRankItem> rankItems=adCreativeFeatureContainer.getAll(new ArrayList<>(groupMap.keySet()));
-//        Map<Long, AdRankItem> cache=adCreativeFeatureContainer.getAll(new ArrayList<>(groupMap.keySet()));
-//        List<AdRankItem> rankItems=Collections.emptyList();
-//        if(!cache.isEmpty()){
-//            rankItems=new LinkedList<>(cache.values());
-//        }
+        Map<Long, AdRankItem> cache=adCreativeFeatureContainer.getAll(new ArrayList<>(groupMap.keySet()));
+        List<AdRankItem> rankItems=Collections.emptyList();
+        if(!cache.isEmpty()){
+            rankItems=new LinkedList<>(cache.values());
+        }
         for(AdRankItem item:rankItems){
             try {
 //                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()+"").get(0);
@@ -246,16 +241,11 @@ public class RankServiceImpl implements RankService {
                 .collect(Collectors.groupingBy(creativeDTO -> creativeDTO.getCreativeId()));
 
 
-//        List<AdRankItem> rankItems=featureRemoteService.
-//                getAllAdFeatureList(
-//                        new ArrayList<>(groupMap.keySet())
-//                );
-        List<AdRankItem> rankItems=adCreativeFeatureContainer.getAll(new ArrayList<>(groupMap.keySet()));
-//        Map<Long, AdRankItem> cache=adCreativeFeatureContainer.getAll(new ArrayList<>(groupMap.keySet()));
-//        List<AdRankItem> rankItems=Collections.emptyList();
-//        if(!cache.isEmpty()){
-//            rankItems=new LinkedList<>(cache.values());
-//        }
+        Map<Long, AdRankItem> cache=adCreativeFeatureContainer.getAll(new ArrayList<>(groupMap.keySet()));
+        List<AdRankItem> rankItems=Collections.emptyList();
+        if(!cache.isEmpty()){
+            rankItems=new LinkedList<>(cache.values());
+        }
         for(AdRankItem item:rankItems){
             try {
                 AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()).get(0);