增加本地缓存

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

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

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

@@ -65,15 +65,17 @@ public class RankServiceImpl implements RankService {
             userAdFeature=new UserAdFeature();
         }
 
-//        List<AdRankItem> rankItems=featureRemoteService.
-//                getAllAdFeatureList(
-//                        CommonCollectionUtils.toList(request.getAdIdList(),id->id.toString())
-//                );
-        Map<Long, AdRankItem> cache=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());
+//        List<AdRankItem> rankItems=Collections.emptyList();
+//        if(!cache.isEmpty()){
+//            rankItems=new LinkedList<>(cache.values());
+//        }
 
 
         //避免recommend-feature出问题
@@ -141,16 +143,13 @@ public class RankServiceImpl implements RankService {
                 .stream()
                 .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());
-        }
+
+        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());
+//        }
         for(AdRankItem item:rankItems){
             try {
 //                AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()+"").get(0);
@@ -251,12 +250,12 @@ public class RankServiceImpl implements RankService {
 //                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());
-        }
+        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());
+//        }
         for(AdRankItem item:rankItems){
             try {
                 AdPlatformBidCreativeDTO dto=groupMap.get(item.getAdId()).get(0);