diff --git a/service/src/main/java/com/yoho/search/restapi/ProductIndexController.java b/service/src/main/java/com/yoho/search/restapi/ProductIndexController.java
index 5b912d2..06f9ca1 100644
--- a/service/src/main/java/com/yoho/search/restapi/ProductIndexController.java
+++ b/service/src/main/java/com/yoho/search/restapi/ProductIndexController.java
@@ -14,7 +14,7 @@ import com.yoho.search.common.utils.HttpServletRequestUtils;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.scene.brandshop.BrandService;
import com.yoho.search.service.scene.common.ProductCountService;
-import com.yoho.search.service.scene.aggregations.ProductIndexService;
+import com.yoho.search.service.scene.aggregations.ProductIndexAggService;
import com.yoho.search.service.scene.aggregations.SelectionsForApp;
import com.yoho.search.service.scene.aggregations.SelectionsForPc;
@@ -23,7 +23,7 @@ import com.yoho.search.service.scene.aggregations.SelectionsForPc;
public class ProductIndexController {
@Autowired
- private ProductIndexService productIndexService;
+ private ProductIndexAggService productIndexAggService;
@Autowired
private SelectionsForPc selectionsWithAdvanceService;
@Autowired
@@ -40,7 +40,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggGender(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggGender(paramMap);
+ return productIndexAggService.aggGender(paramMap);
}
/**
@@ -50,7 +50,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggAgeLevel(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggAgeLevel(paramMap);
+ return productIndexAggService.aggAgeLevel(paramMap);
}
/**
@@ -60,7 +60,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggPrice(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggPrice(paramMap);
+ return productIndexAggService.aggPrice(paramMap);
}
/**
@@ -70,7 +70,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggColor(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggColor(paramMap);
+ return productIndexAggService.aggColor(paramMap);
}
/**
@@ -80,7 +80,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggStyle(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggStyle(paramMap);
+ return productIndexAggService.aggStyle(paramMap);
}
/**
@@ -90,7 +90,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggStandard(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggStandard(paramMap);
+ return productIndexAggService.aggStandard(paramMap);
}
/**
@@ -100,7 +100,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggSize(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggSize(paramMap);
+ return productIndexAggService.aggSize(paramMap);
}
/**
@@ -110,7 +110,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggNew(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggNew(paramMap);
+ return productIndexAggService.aggNew(paramMap);
}
/**
@@ -120,7 +120,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggLimited(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggLimited(paramMap);
+ return productIndexAggService.aggLimited(paramMap);
}
/**
@@ -130,7 +130,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggSpecialoffer(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggSpecialoffer(paramMap);
+ return productIndexAggService.aggSpecialoffer(paramMap);
}
/**
@@ -140,7 +140,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggShop(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggShops(paramMap);
+ return productIndexAggService.aggShops(paramMap);
}
/**
@@ -150,7 +150,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult recommendKeyword(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggKeywords(paramMap);
+ return productIndexAggService.aggKeywords(paramMap);
}
/**
@@ -200,7 +200,7 @@ public class ProductIndexController {
@ResponseBody
public SearchApiResult aggPromotion(HttpServletRequest request) {
Map<String, String> paramMap = HttpServletRequestUtils.transParamType(request);
- return productIndexService.aggPromotion(paramMap);
+ return productIndexAggService.aggPromotion(paramMap);
}
}
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/AggregationService.java b/service/src/main/java/com/yoho/search/service/aggregations/AggregationsService.java
index b145c06..1853429 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/AggregationService.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/AggregationsService.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations;
+package com.yoho.search.service.aggregations;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
@@ -11,7 +11,7 @@ import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.IgnoreSomeException;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.service.scene.hongren.ShopProductCacheBean;
import com.yoho.search.service.recall.models.common.ParamQueryFilter;
import com.yoho.search.service.scene.hongren.ShopProductRequest;
@@ -35,9 +35,9 @@ import java.util.*;
import java.util.stream.Collectors;
@Service
-public class AggregationService extends AbstractCacheAbleService implements ApplicationEventPublisherAware {
+public class AggregationsService extends AbstractCacheAbleService implements ApplicationEventPublisherAware {
- private static final Logger logger = LoggerFactory.getLogger(AggregationService.class);
+ private static final Logger logger = LoggerFactory.getLogger(AggregationsService.class);
@Autowired
private AggregationFactory aggregationFactory;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/AbstractSingleFieldAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/AbstractSingleFieldAggregation.java
index 0ef22bc..c44e025 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/AbstractSingleFieldAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/AbstractSingleFieldAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.core.es.agg.AbstractAggregation;
import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/AgeLevelAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/AgeLevelAggregation.java
index 2cffa18..bf12b24 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/AgeLevelAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/AgeLevelAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/AggregationFactory.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/AggregationFactory.java
index cb3ca65..07337da 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/AggregationFactory.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/AggregationFactory.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.service.index.promotion.PromotionIndexBaseService;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/BrandAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/BrandAggregation.java
index 3401fe7..6002703 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/BrandAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/BrandAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/BrandNameAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/BrandNameAggregation.java
index 53c16c8..fa639b9 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/BrandNameAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/BrandNameAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.base.utils.ProductIndexEsField;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ColorAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/ColorAggregation.java
index 3b8355c..6c07cfd 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ColorAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/ColorAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashSet;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/CustomizeTagAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/CustomizeTagAggregation.java
index 6894d95..c8fbdc5 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/CustomizeTagAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/CustomizeTagAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.List;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/DiscountAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/DiscountAggregation.java
index d9c33ef..80f27d1 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/DiscountAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/DiscountAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.HashMap;
import java.util.Iterator;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GenderAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/GenderAggregation.java
index 5dcef50..2dcdd8d 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GenderAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/GenderAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GenderNewAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/GenderNewAggregation.java
index 1c4695b..b02ef9c 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GenderNewAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/GenderNewAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GroupBrandAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/GroupBrandAggregation.java
index 4e84a47..f1f8b45 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GroupBrandAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/GroupBrandAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GroupShopAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/GroupShopAggregation.java
index d36ca33..7872a8e 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/GroupShopAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/GroupShopAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsGlobalAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsGlobalAggregation.java
index 0054e8b..01482c1 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsGlobalAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsGlobalAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.Map;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsLimitedAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsLimitedAggregation.java
index ff5c747..94a75cc 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsLimitedAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsLimitedAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.Map;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsNewAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsNewAggregation.java
index e17c633..885b051 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsNewAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsNewAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.Map;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsSecialofferAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsSecialofferAggregation.java
index b204349..04f7985 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/IsSecialofferAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/IsSecialofferAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.Map;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/KeywordAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/KeywordAggregation.java
index e50ce9b..132ca1f 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/KeywordAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/KeywordAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Arrays;
import java.util.List;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/PriceAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/PriceAggregation.java
index ba26644..4b3460c 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/PriceAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/PriceAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/PromotionAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/PromotionAggregation.java
index 9687df4..c2ae288 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/PromotionAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/PromotionAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.base.utils.DateUtil;
import com.yoho.search.base.utils.ProductIndexEsField;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecentShelveDayAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecentShelveDayAggregation.java
index e7fa758..a6d2fd5 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecentShelveDayAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecentShelveDayAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecommendBrandAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecommendBrandAggregation.java
index 972bde4..77211af 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecommendBrandAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecommendBrandAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.List;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecommendPromotionAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecommendPromotionAggregation.java
index c3ea949..ec7da40 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecommendPromotionAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecommendPromotionAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.base.utils.DateUtil;
import com.yoho.search.base.utils.ProductIndexEsField;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecommendShopAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecommendShopAggregation.java
index b3df374..1e98fd1 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/RecommendShopAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/RecommendShopAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ShopAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/ShopAggregation.java
index 40f1f70..9aa3a8c 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ShopAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/ShopAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ShopAndSknAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/ShopAndSknAggregation.java
index e067ece..9996f57 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ShopAndSknAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/ShopAndSknAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.base.utils.ProductIndexEsField;
import org.apache.commons.lang3.StringUtils;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SizeAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/SizeAggregation.java
index 20d3d58..b45e6bd 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SizeAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/SizeAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashSet;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SortGroupAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/SortGroupAggregation.java
index 557c327..88d3dfc 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SortGroupAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/SortGroupAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StandardAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/StandardAggregation.java
index 3cb820a..2c24eaf 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StandardAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/StandardAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.ArrayList;
import java.util.HashMap;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StyleAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/StyleAggregation.java
index dc2473c..343e863 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StyleAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/StyleAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import java.util.Iterator;
import java.util.LinkedHashSet;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ZqNameAggregation.java b/service/src/main/java/com/yoho/search/service/aggregations/impls/ZqNameAggregation.java
index 464d5c0..d3020a4 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/ZqNameAggregation.java
+++ b/service/src/main/java/com/yoho/search/service/aggregations/impls/ZqNameAggregation.java
@@ -1,4 +1,4 @@
-package com.yoho.search.service.scene.aggregations.impls;
+package com.yoho.search.service.aggregations.impls;
import com.yoho.search.base.utils.ProductIndexEsField;
import com.yoho.search.service.index.ZqNameIndexBaseService;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/DiscountService.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/DiscountService.java
index 4ffbd19..37dda29 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/DiscountService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/DiscountService.java
@@ -13,7 +13,7 @@ import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.IgnoreSomeException;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.service.helper.SearchAfterCacheHelper;
import com.yoho.search.service.helper.SearchParamHelper;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/ProductIndexService.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/ProductIndexAggService.java
index b1c3381..f7ead39 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/ProductIndexService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/ProductIndexAggService.java
@@ -6,6 +6,7 @@ import com.yoho.search.base.utils.EventReportEnum;
import com.yoho.search.base.utils.JsonUtil;
import com.yoho.search.core.es.utils.IgnoreSomeException;
import com.yoho.search.models.SearchApiResult;
+import com.yoho.search.service.aggregations.AggregationsService;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,12 +21,12 @@ import java.util.Random;
import java.util.stream.Collectors;
@Service
-public class ProductIndexService implements ApplicationEventPublisherAware {
+public class ProductIndexAggService implements ApplicationEventPublisherAware {
- private static final Logger logger = LoggerFactory.getLogger(ProductIndexService.class);
+ private static final Logger logger = LoggerFactory.getLogger(ProductIndexAggService.class);
@Autowired
- private AggregationService aggregationService;
+ private AggregationsService aggregationsService;
ApplicationEventPublisher publisher;
@@ -55,7 +56,7 @@ public class ProductIndexService implements ApplicationEventPublisherAware {
public Object getResult() throws Exception;
}
- private SearchApiResult getSearchApiResult(String methodName, Map<String, String> paramMap, ProductIndexService.Searcher searcher) {
+ private SearchApiResult getSearchApiResult(String methodName, Map<String, String> paramMap, ProductIndexAggService.Searcher searcher) {
long begin = System.currentTimeMillis();
logger.info("[model=ProductIndexService][func={}][param={}][begin={}]", methodName, paramMap.toString(), begin);
try {
@@ -73,90 +74,90 @@ public class ProductIndexService implements ApplicationEventPublisherAware {
}
public SearchApiResult aggAgeLevel(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggAgeLevel", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggAgeLevel", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getAgeLevelAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getAgeLevelAggregationResult(paramMap, false);
return jsonObject.get("ageLevelAgg");
}
});
}
public SearchApiResult aggGender(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggGender", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggGender", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getGenderNewAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getGenderNewAggregationResult(paramMap, false);
return jsonObject.get("genderAgg");
}
});
}
public SearchApiResult aggPrice(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggPrice", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggPrice", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getPriceAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getPriceAggregationResult(paramMap, false);
return jsonObject.get("priceAgg");
}
});
}
public SearchApiResult aggColor(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggColor", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggColor", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getColorAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getColorAggregationResult(paramMap, false);
return jsonObject.get("colorAgg");
}
});
}
public SearchApiResult aggStyle(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggStyle", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggStyle", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getStyleAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getStyleAggregationResult(paramMap, false);
return jsonObject.get("styleAgg");
}
});
}
public SearchApiResult aggStandard(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggStandard", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggStandard", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getStandardAggregationResult(paramMap);
+ JSONObject jsonObject = aggregationsService.getStandardAggregationResult(paramMap);
return jsonObject.get("standardAgg");
}
});
}
public SearchApiResult aggSize(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggSize", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggSize", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getSizeAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getSizeAggregationResult(paramMap, false);
return jsonObject.get("sizeAgg");
}
});
}
public SearchApiResult aggPromotion(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggPromotion", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggPromotion", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getPromotionAggregationResult(paramMap, 1000);
+ JSONObject jsonObject = aggregationsService.getPromotionAggregationResult(paramMap, 1000);
return jsonObject.get("promotionAgg");
}
});
}
public SearchApiResult aggShops(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggShops", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggShops", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getShopAggregationResult(paramMap, 100);
+ JSONObject jsonObject = aggregationsService.getShopAggregationResult(paramMap, 100);
return jsonObject.get("shopAgg");
}
});
@@ -164,10 +165,10 @@ public class ProductIndexService implements ApplicationEventPublisherAware {
public SearchApiResult aggNew(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggNew", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggNew", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getIsNewAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getIsNewAggregationResult(paramMap, false);
Object isNewResponse = jsonObject.get("isnewAgg");
if (isNewResponse != null && ((Boolean) isNewResponse).booleanValue()) {
return "Y";
@@ -179,10 +180,10 @@ public class ProductIndexService implements ApplicationEventPublisherAware {
}
public SearchApiResult aggLimited(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggLimited", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggLimited", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getIsLimitAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getIsLimitAggregationResult(paramMap, false);
Object islimitedAgg = jsonObject.get("islimitedAgg");
if (islimitedAgg != null && ((Boolean) islimitedAgg).booleanValue()) {
return "Y";
@@ -194,10 +195,10 @@ public class ProductIndexService implements ApplicationEventPublisherAware {
}
public SearchApiResult aggSpecialoffer(Map<String, String> paramMap) {
- return this.getSearchApiResult("aggSpecialoffer", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggSpecialoffer", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getIsSecialofferAggregationResult(paramMap, false);
+ JSONObject jsonObject = aggregationsService.getIsSecialofferAggregationResult(paramMap, false);
Object specialofferAgg = jsonObject.get("specialofferAgg");
if (specialofferAgg != null && ((Boolean) specialofferAgg).booleanValue()) {
return "Y";
@@ -210,10 +211,10 @@ public class ProductIndexService implements ApplicationEventPublisherAware {
public SearchApiResult aggKeywords(Map<String, String> paramMap) {
final int randomKeywordCount = StringUtils.isBlank(paramMap.get("keyword_count")) ? 8 : Integer.parseInt(paramMap.get("keyword_count"));
- return this.getSearchApiResult("aggKeywords", paramMap, new ProductIndexService.Searcher() {
+ return this.getSearchApiResult("aggKeywords", paramMap, new ProductIndexAggService.Searcher() {
@Override
public Object getResult() throws Exception {
- JSONObject jsonObject = aggregationService.getKeywordAggregationResult(paramMap, 50);
+ JSONObject jsonObject = aggregationsService.getKeywordAggregationResult(paramMap, 50);
@SuppressWarnings("unchecked")
List<String> keywordList = (List<String>) jsonObject.get("keywordAgg");
return getRandomKeywords(keywordList, randomKeywordCount);
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/RecentService.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/RecentService.java
index e7e8c75..6bc3029 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/RecentService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/RecentService.java
@@ -16,7 +16,7 @@ import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.IgnoreSomeException;
import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.service.helper.SearchAfterCacheHelper;
import com.yoho.search.service.helper.SearchParamHelper;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneAggregationsHelper.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneAggregationsHelper.java
index 9fc52c8..40c8245 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneAggregationsHelper.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneAggregationsHelper.java
@@ -9,7 +9,7 @@ import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.models.RecommendPromotionAggVO;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.helper.SearchParamHelper;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.service.index.promotion.PromotionIndexBaseService;
import org.elasticsearch.search.aggregations.Aggregation;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneSelectionsService.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneSelectionsService.java
index a73b070..74977ea 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneSelectionsService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/SceneSelectionsService.java
@@ -9,7 +9,7 @@ import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.service.helper.SearchParamHelper;
import org.elasticsearch.index.query.BoolQueryBuilder;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/SearchSortGroupService.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/SearchSortGroupService.java
index 58952a6..ddd8206 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/SearchSortGroupService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/SearchSortGroupService.java
@@ -17,7 +17,7 @@ import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.IgnoreSomeException;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.common.SearchRequestParams;
import com.yoho.search.service.helper.SearchCommonHelper;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForApp.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForApp.java
index 5fd8c89..b059e7b 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForApp.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForApp.java
@@ -13,7 +13,7 @@ import com.yoho.search.common.utils.SearchApiResultUtils;
import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.service.index.BrandIndexBaseService;
import com.yoho.search.service.index.ColorIndexBaseService;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForPc.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForPc.java
index 2174f91..2d80fbc 100644
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForPc.java
+++ b/service/src/main/java/com/yoho/search/service/scene/aggregations/SelectionsForPc.java
@@ -12,7 +12,7 @@ import com.yoho.search.cache.model.SearchCache;
import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.common.SearchRequestParams;
import com.yoho.search.service.index.BrandIndexBaseService;
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SmallSortNameAggregation.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SmallSortNameAggregation.java
deleted file mode 100644
index cd69f97..0000000
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/SmallSortNameAggregation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.yoho.search.service.scene.aggregations.impls;
-
-import com.yoho.search.base.utils.ProductIndexEsField;
-
-public class SmallSortNameAggregation extends AbstractSingleFieldAggregation {
-
- public SmallSortNameAggregation(int count) {
- super(count);
- }
-
- @Override
- public String aggName() {
- return "smallSortNameAgg";
- }
-
- @Override
- public String filterName() {
- return "smallSortName";
- }
-
- @Override
- protected String getField() {
- return ProductIndexEsField.smallSort_smallSort_keyword;
- }
-
-
-}
diff --git a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StyleNameAggregation.java b/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StyleNameAggregation.java
deleted file mode 100644
index 9556caf..0000000
--- a/service/src/main/java/com/yoho/search/service/scene/aggregations/impls/StyleNameAggregation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.yoho.search.service.scene.aggregations.impls;
-
-import com.yoho.search.base.utils.ProductIndexEsField;
-
-public class StyleNameAggregation extends AbstractSingleFieldAggregation {
-
- public StyleNameAggregation(int count) {
- super(count);
- }
-
- @Override
- public String aggName() {
- return "styleNameAgg";
- }
-
- @Override
- public String filterName() {
- return "styleName";
- }
-
- @Override
- protected String getField() {
- return ProductIndexEsField.style;
- }
-
-
-}
diff --git a/service/src/main/java/com/yoho/search/service/scene/brandshop/AggRecommendService.java b/service/src/main/java/com/yoho/search/service/scene/brandshop/AggRecommendService.java
index a92c4f6..e7ca52c 100644
--- a/service/src/main/java/com/yoho/search/service/scene/brandshop/AggRecommendService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/brandshop/AggRecommendService.java
@@ -15,8 +15,8 @@ import com.yoho.search.cache.model.SearchCache;
import com.yoho.search.common.utils.SearchApiResultUtils;
import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
-import com.yoho.search.service.scene.aggregations.AggregationService;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.AggregationsService;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchDynamicConfigService;
import com.yoho.search.common.SearchRequestParams;
import com.yoho.search.service.helper.SearchParamHelper;
@@ -35,7 +35,7 @@ public class AggRecommendService extends AbstractCacheAbleService {
private static final int DEFAULT_AGGREGATION_COUNT = 100;
@Autowired
- private AggregationService aggregationService;
+ private AggregationsService aggregationsService;
@Autowired
private AggregationFactory aggregationFactory;
@Autowired
@@ -81,7 +81,7 @@ public class AggRecommendService extends AbstractCacheAbleService {
return new SearchApiResult().setData(cacheJSONArray);
}
// 6、从ES中获取
- JSONObject recommendBrandResult = aggregationService.getAggNameAndResponse(recommendBrandAgg, searchParam);
+ JSONObject recommendBrandResult = aggregationsService.getAggNameAndResponse(recommendBrandAgg, searchParam);
if (recommendBrandResult == null) {
return new SearchApiResult().setData(500).setMessage("exception");
}
@@ -133,7 +133,7 @@ public class AggRecommendService extends AbstractCacheAbleService {
return this.getRecommendShopSearchApiResult(cacheJSONArray, page, count);
}
// 6、从ES中获取
- JSONObject recommendShopResult = aggregationService.getAggNameAndResponse(recommendShopAgg, searchParam);
+ JSONObject recommendShopResult = aggregationsService.getAggNameAndResponse(recommendShopAgg, searchParam);
if (recommendShopResult == null) {
return new SearchApiResult().setData(500).setMessage("exception");
}
diff --git a/service/src/main/java/com/yoho/search/service/scene/brandshop/BrandService.java b/service/src/main/java/com/yoho/search/service/scene/brandshop/BrandService.java
index ed681db..4164901 100644
--- a/service/src/main/java/com/yoho/search/service/scene/brandshop/BrandService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/brandshop/BrandService.java
@@ -18,8 +18,8 @@ import com.yoho.search.core.es.agg.IAggregation;
import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.IgnoreSomeException;
-import com.yoho.search.service.scene.aggregations.AggregationService;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.AggregationsService;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.common.SearchRequestParams;
import com.yoho.search.service.index.BrandIndexBaseService;
@@ -66,7 +66,7 @@ public class BrandService extends AbstractCacheAbleService implements Applicatio
@Autowired
private SearchParamHelper searchParamHelper;
@Autowired
- private AggregationService aggregationService;
+ private AggregationsService aggregationsService;
@Autowired
private SearchCommonService searchCommonService;
@Autowired
@@ -117,7 +117,7 @@ public class BrandService extends AbstractCacheAbleService implements Applicatio
return new SearchApiResult().setData(cacheJSONArray);
}
// 4、从ES中获取
- JSONObject jsonObject = aggregationService.getAggNameAndResponse(brandAggregation, searchParam);
+ JSONObject jsonObject = aggregationsService.getAggNameAndResponse(brandAggregation, searchParam);
if (jsonObject == null) {
return new SearchApiResult().setData(500).setMessage("exception");
}
@@ -276,7 +276,7 @@ public class BrandService extends AbstractCacheAbleService implements Applicatio
searchParam.setSize(0);
// 4、从ES中获取
- JSONObject groupBrandResult = aggregationService.getAggNameAndResponseWithTotal(groupBrandAgg, searchParam);
+ JSONObject groupBrandResult = aggregationsService.getAggNameAndResponseWithTotal(groupBrandAgg, searchParam);
if (groupBrandResult == null) {
return new SearchApiResult().setData(500).setMessage("exception");
}
diff --git a/service/src/main/java/com/yoho/search/service/scene/brandshop/ShopsService.java b/service/src/main/java/com/yoho/search/service/scene/brandshop/ShopsService.java
index 6dfcc29..9e56aca 100644
--- a/service/src/main/java/com/yoho/search/service/scene/brandshop/ShopsService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/brandshop/ShopsService.java
@@ -14,8 +14,8 @@ import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.core.es.utils.IgnoreSomeException;
import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.aggregations.AggregationService;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.AggregationsService;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.common.SearchRequestParams;
import com.yoho.search.service.helper.SearchParamHelper;
@@ -48,7 +48,7 @@ public class ShopsService extends BaseService implements ApplicationEventPublish
@Autowired
private ShopListService shopListService;
@Autowired
- private AggregationService aggregationService;
+ private AggregationsService aggregationsService;
@Autowired
private AggregationFactory aggregationFactory;
@Autowired
@@ -75,7 +75,7 @@ public class ShopsService extends BaseService implements ApplicationEventPublish
searchParam.setOffset(0);
searchParam.setSize(0);
// 4、从ES中获取
- JSONObject aggNameAndResponse = aggregationService.getAggNameAndResponseWithTotal(groupShopAgg, searchParam);
+ JSONObject aggNameAndResponse = aggregationsService.getAggNameAndResponseWithTotal(groupShopAgg, searchParam);
if (aggNameAndResponse == null) {
return new SearchApiResult().setData(500).setMessage("exception");
}
diff --git a/service/src/main/java/com/yoho/search/service/scene/hongren/SearchHongRenService.java b/service/src/main/java/com/yoho/search/service/scene/hongren/SearchHongRenService.java
index f488ebc..0ada745 100644
--- a/service/src/main/java/com/yoho/search/service/scene/hongren/SearchHongRenService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/hongren/SearchHongRenService.java
@@ -7,7 +7,7 @@ import com.yoho.search.common.utils.SearchApiResultUtils;
import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.helper.SearchCommonHelper;
import com.yoho.search.service.helper.SearchKeyWordHelper;
-import com.yoho.search.service.scene.aggregations.AggregationService;
+import com.yoho.search.service.aggregations.AggregationsService;
import com.yoho.search.service.scene.common.BaseSceneService;
import com.yoho.search.service.scene.list.ProductListSwitchService;
import org.apache.commons.lang3.StringUtils;
@@ -22,7 +22,7 @@ public class SearchHongRenService extends BaseSceneService {
@Autowired
protected SearchCacheService searchCacheService;
@Autowired
- private AggregationService aggregationService;
+ private AggregationsService aggregationsService;
@Autowired
private ProductListSwitchService productListSwitchService;
@Autowired
@@ -42,7 +42,7 @@ public class SearchHongRenService extends BaseSceneService {
}
SearchApiResult searchApiResult = new SearchApiResult().setCode(200).setMessage("Shop product List .");
try {
- JSONObject dataMap = aggregationService.getShopAndSknAggregationResult(paramMap, page, pageSize, 10000);
+ JSONObject dataMap = aggregationsService.getShopAndSknAggregationResult(paramMap, page, pageSize, 10000);
searchApiResult.setData(dataMap);
} catch (Exception e) {
return new SearchApiResult().setData(null).setMessage("ShopProductList Exception").setCode(500);
diff --git a/service/src/main/java/com/yoho/search/service/scene/promotion/PromotionAggregationsService.java b/service/src/main/java/com/yoho/search/service/scene/promotion/PromotionAggregationsService.java
index 63a5a97..352ab83 100644
--- a/service/src/main/java/com/yoho/search/service/scene/promotion/PromotionAggregationsService.java
+++ b/service/src/main/java/com/yoho/search/service/scene/promotion/PromotionAggregationsService.java
@@ -26,7 +26,7 @@ import com.yoho.search.core.es.model.SearchParam;
import com.yoho.search.core.es.model.SearchResult;
import com.yoho.search.models.PromotionConditions;
import com.yoho.search.models.SearchApiResult;
-import com.yoho.search.service.scene.aggregations.impls.AggregationFactory;
+import com.yoho.search.service.aggregations.impls.AggregationFactory;
import com.yoho.search.common.SearchCommonService;
import com.yoho.search.service.helper.SearchAfterCacheHelper;
import com.yoho.search.service.helper.SearchParamHelper;