yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit 8d9ea2bdc4609f3c6015fa9780dae4a99d314184 1 parent 41b255dd

店铺收藏和品牌收藏去除个性化

Inline Side-by-side
Showing 4 changed files with 2 additions and 8 deletions
@@ -77,6 +77,6 @@ fi @@ -77,6 +77,6 @@ fi
77 JAVA_OPTS=" $JAVA_OPTS $SERVER_BASE_DIR " 77 JAVA_OPTS=" $JAVA_OPTS $SERVER_BASE_DIR "
78 78
79 #jmx 79 #jmx
80 -export JMX_PORT=`expr 9600 + $SERVER_PORT` 80 +export JMX_PORT=`expr 9900 + $SERVER_PORT`
81 export LOCAL_IP=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|awk 'NR==1 {print}'` 81 export LOCAL_IP=`/sbin/ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|awk 'NR==1 {print}'`
82 export CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=$LOCAL_IP -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" 82 export CATALINA_OPTS="$CATALINA_OPTS -Djava.rmi.server.hostname=$LOCAL_IP -Dcom.sun.management.jmxremote.port=$JMX_PORT -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
@@ -55,7 +55,6 @@ public class BrandController { @@ -55,7 +55,6 @@ public class BrandController {
55 * @param request 55 * @param request
56 * @return 56 * @return
57 */ 57 */
58 - @PersionalRateLimit(isOrderUseable = false)  
59 @RequestMapping(method = RequestMethod.GET, value = "/group_brands") 58 @RequestMapping(method = RequestMethod.GET, value = "/group_brands")
60 @ResponseBody 59 @ResponseBody
61 public SearchApiResult groupBrands(HttpServletRequest request) { 60 public SearchApiResult groupBrands(HttpServletRequest request) {
@@ -36,7 +36,6 @@ public class ShopsController { @@ -36,7 +36,6 @@ public class ShopsController {
36 * @param request 36 * @param request
37 * @return 37 * @return
38 */ 38 */
39 - @PersionalRateLimit(isOrderUseable = false)  
40 @RequestMapping(method = RequestMethod.GET, value = "/group_shops") 39 @RequestMapping(method = RequestMethod.GET, value = "/group_shops")
41 @ResponseBody 40 @ResponseBody
42 public SearchApiResult group_shops(HttpServletRequest request) { 41 public SearchApiResult group_shops(HttpServletRequest request) {
@@ -55,8 +55,6 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl @@ -55,8 +55,6 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
55 @Autowired 55 @Autowired
56 private AggregationService aggregationService; 56 private AggregationService aggregationService;
57 @Autowired 57 @Autowired
58 - private SearchCommonHelper searchCommonHelper;  
59 - @Autowired  
60 private AggregationFactoryService aggregationFactoryService; 58 private AggregationFactoryService aggregationFactoryService;
61 @Autowired 59 @Autowired
62 private SearchParamHelper searchParamHelper; 60 private SearchParamHelper searchParamHelper;
@@ -76,14 +74,12 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl @@ -76,14 +74,12 @@ public class ShopsServiceImpl extends BaseService implements IShopsService, Appl
76 int topHitCount = StringUtils.isBlank(paramMap.get("viewNum")) ? 10 : Integer.parseInt(paramMap.get("viewNum")); 74 int topHitCount = StringUtils.isBlank(paramMap.get("viewNum")) ? 10 : Integer.parseInt(paramMap.get("viewNum"));
77 // 2、获取聚合的排序规则 75 // 2、获取聚合的排序规则
78 String topHitOrder = "heatValue:desc"; 76 String topHitOrder = "heatValue:desc";
79 -  
80 // 3、构建searchParam 77 // 3、构建searchParam
81 - SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, topHitCount > 0 ? true : false); 78 + SearchParam searchParam = searchParamHelper.buildWithPersional(paramMap, false);
82 IAggregation groupShopAgg = aggregationFactoryService.getGroupShopAggregation(topHitOrder, topHitCount); 79 IAggregation groupShopAgg = aggregationFactoryService.getGroupShopAggregation(topHitOrder, topHitCount);
83 searchParam.setAggregationBuilders(Arrays.asList(groupShopAgg.getBuilder())); 80 searchParam.setAggregationBuilders(Arrays.asList(groupShopAgg.getBuilder()));
84 searchParam.setOffset(0); 81 searchParam.setOffset(0);
85 searchParam.setSize(0); 82 searchParam.setSize(0);
86 -  
87 // 4、从ES中获取 83 // 4、从ES中获取
88 JSONObject aggNameAndResponse = aggregationService.getAggNameAndResponseWithTotal(groupShopAgg, searchParam); 84 JSONObject aggNameAndResponse = aggregationService.getAggNameAndResponseWithTotal(groupShopAgg, searchParam);
89 if (aggNameAndResponse == null) { 85 if (aggNameAndResponse == null) {