yoho-search / yoho-search-consumer · Commits

Go to a project

Authored by unknown
Commit 0d3c6b9d214acb9a19e7d5c3a5ae5c5dd10bd252 2 parents b7fb8669 7d37717a

Merge branch 'analysis' into wn_photoSearch

Inline Side-by-side
Showing 5 changed files with 258 additions and 100 deletions
1 package com.yoho.search.consumer.index.common.impl; 1 package com.yoho.search.consumer.index.common.impl;
2 2
  3 +import java.io.InputStream;
  4 +import java.util.ArrayList;
  5 +import java.util.HashMap;
  6 +import java.util.List;
  7 +import java.util.Map;
  8 +import java.util.Set;
  9 +import java.util.concurrent.ConcurrentHashMap;
  10 +import java.util.regex.Pattern;
  11 +
  12 +import javax.annotation.PostConstruct;
  13 +
  14 +import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;
  15 +import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse.AnalyzeToken;
  16 +import org.elasticsearch.action.bulk.BulkResponse;
  17 +import org.elasticsearch.action.get.GetResponse;
  18 +import org.elasticsearch.action.get.MultiGetResponse;
  19 +import org.elasticsearch.cluster.health.ClusterHealthStatus;
  20 +import org.slf4j.Logger;
  21 +import org.slf4j.LoggerFactory;
  22 +import org.springframework.beans.factory.annotation.Autowired;
  23 +import org.springframework.beans.factory.config.YamlMapFactoryBean;
  24 +import org.springframework.context.ApplicationEventPublisher;
  25 +import org.springframework.context.ApplicationEventPublisherAware;
  26 +import org.springframework.core.io.ClassPathResource;
  27 +import org.springframework.stereotype.Component;
  28 +
3 import com.yoho.search.base.utils.FileUtils; 29 import com.yoho.search.base.utils.FileUtils;
4 import com.yoho.search.base.utils.JaxbBinder; 30 import com.yoho.search.base.utils.JaxbBinder;
5 import com.yoho.search.consumer.index.common.IIndexBuilder; 31 import com.yoho.search.consumer.index.common.IIndexBuilder;
@@ -17,27 +43,6 @@ import com.yoho.search.core.es.impl.YohoIndexHelper; @@ -17,27 +43,6 @@ import com.yoho.search.core.es.impl.YohoIndexHelper;
17 import com.yoho.search.core.es.model.ESBluk; 43 import com.yoho.search.core.es.model.ESBluk;
18 import com.yoho.search.core.es.model.SearchParam; 44 import com.yoho.search.core.es.model.SearchParam;
19 import com.yoho.search.core.es.model.SearchResult; 45 import com.yoho.search.core.es.model.SearchResult;
20 -import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse;  
21 -import org.elasticsearch.action.admin.indices.analyze.AnalyzeResponse.AnalyzeToken;  
22 -import org.elasticsearch.action.bulk.BulkResponse;  
23 -import org.elasticsearch.action.get.GetResponse;  
24 -import org.elasticsearch.action.get.MultiGetResponse;  
25 -import org.elasticsearch.cluster.health.ClusterHealthStatus;  
26 -import org.slf4j.Logger;  
27 -import org.slf4j.LoggerFactory;  
28 -import org.springframework.beans.factory.annotation.Autowired;  
29 -import org.springframework.context.ApplicationEventPublisher;  
30 -import org.springframework.context.ApplicationEventPublisherAware;  
31 -import org.springframework.stereotype.Component;  
32 -  
33 -import javax.annotation.PostConstruct;  
34 -import java.io.InputStream;  
35 -import java.util.ArrayList;  
36 -import java.util.List;  
37 -import java.util.Map;  
38 -import java.util.Set;  
39 -import java.util.concurrent.ConcurrentHashMap;  
40 -import java.util.regex.Pattern;  
41 46
42 @Component 47 @Component
43 public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEventPublisherAware { 48 public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEventPublisherAware {
@@ -65,6 +70,11 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent @@ -65,6 +70,11 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent
65 // 索引配置文件 70 // 索引配置文件
66 private String configFile = "index.xml"; 71 private String configFile = "index.xml";
67 72
  73 + // 分词器配置文件
  74 + private static final String analysisPath = "analysis.yml";
  75 +
  76 + private Map<String,Object> analysisConfigMap = new HashMap<String, Object>();
  77 +
68 private Map<String, IYohoIndex> nameToIndexMap = new ConcurrentHashMap<String, IYohoIndex>(50); 78 private Map<String, IYohoIndex> nameToIndexMap = new ConcurrentHashMap<String, IYohoIndex>(50);
69 79
70 @PostConstruct 80 @PostConstruct
@@ -72,6 +82,7 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent @@ -72,6 +82,7 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent
72 long begin = System.currentTimeMillis(); 82 long begin = System.currentTimeMillis();
73 logger.info("[method=load] [step=start]"); 83 logger.info("[method=load] [step=start]");
74 this.configure(this.configFile); 84 this.configure(this.configFile);
  85 + this.initAnalyzerConfig(analysisPath);
75 logger.info("[method=load] [step=end] [cost={}ms]", System.currentTimeMillis() - begin); 86 logger.info("[method=load] [step=end] [cost={}ms]", System.currentTimeMillis() - begin);
76 } 87 }
77 88
@@ -81,7 +92,7 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent @@ -81,7 +92,7 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent
81 * @param configFile 92 * @param configFile
82 * 配置文件的路径 93 * 配置文件的路径
83 */ 94 */
84 - public void configure(String configFile) { 95 + private void configure(String configFile) {
85 try { 96 try {
86 InputStream is = this.getClass().getClassLoader().getResourceAsStream(configFile); 97 InputStream is = this.getClass().getClassLoader().getResourceAsStream(configFile);
87 JaxbBinder jaxbBinder = new JaxbBinder(IndexConfigs.class); 98 JaxbBinder jaxbBinder = new JaxbBinder(IndexConfigs.class);
@@ -106,6 +117,13 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent @@ -106,6 +117,13 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent
106 } 117 }
107 } 118 }
108 119
  120 + private void initAnalyzerConfig(String analysisPath) {
  121 + YamlMapFactoryBean factory = new YamlMapFactoryBean();
  122 + factory.setResources(new ClassPathResource[]{new ClassPathResource(analysisPath)});
  123 + this.analysisConfigMap = factory.getObject();
  124 + logger.info("[func=initAnalyzerConfig][analyzerConfigMap={}]", analysisConfigMap);
  125 + }
  126 +
109 @Override 127 @Override
110 public ClusterHealthStatus getClusterHealthStatus(String yohoIndexName) { 128 public ClusterHealthStatus getClusterHealthStatus(String yohoIndexName) {
111 IYohoIndex index = this.nameToIndexMap.get(yohoIndexName); 129 IYohoIndex index = this.nameToIndexMap.get(yohoIndexName);
@@ -160,15 +178,22 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent @@ -160,15 +178,22 @@ public class YohoIndexServiceImpl implements IYohoIndexService, ApplicationEvent
160 } 178 }
161 // 2、生成真实索引名称 179 // 2、生成真实索引名称
162 String newRealIndexName = yohoIndexHelper.genRealIndexName(yohoIndexName); 180 String newRealIndexName = yohoIndexHelper.genRealIndexName(yohoIndexName);
163 - // 3、创建真实索引  
164 - final Map<String, String> settings = index.getProperties(); 181 +
  182 + // 3、获取索引配置信息
165 final String mappingContent = index.getMappingContent(); 183 final String mappingContent = index.getMappingContent();
166 - client.createIndex(newRealIndexName, yohoIndexName, settings, mappingContent);  
167 - // 4、删除旧索引别名 184 + Map<String, String> properties = index.getProperties();
  185 +
  186 + // 4、创建真实索引[获取分析器信息]
  187 + Map<String,Object> indexSettings = new HashMap<String,Object>();
  188 + indexSettings.putAll(properties);
  189 + indexSettings.put("max_result_window", "100000000");
  190 + indexSettings.putAll(this.analysisConfigMap);
  191 + client.createIndex(newRealIndexName, yohoIndexName, indexSettings, mappingContent);
  192 + // 5、删除旧索引别名
168 if (oldRealIndexNames != null && !oldRealIndexNames.isEmpty()) { 193 if (oldRealIndexNames != null && !oldRealIndexNames.isEmpty()) {
169 client.removeAlias(oldRealIndexNames, alias); 194 client.removeAlias(oldRealIndexNames, alias);
170 } 195 }
171 - // 5、添加新索引别名【如果存在一个名字为alias的真实索引，则直接删除】 196 + // 6、添加新索引别名【如果存在一个名字为alias的真实索引，则直接删除】
172 if (client.indexExists(alias)) { 197 if (client.indexExists(alias)) {
173 client.deleteIndex(alias); 198 client.deleteIndex(alias);
174 } 199 }
@@ -2,6 +2,7 @@ package com.yoho.search.consumer.index.increment.productIndex; @@ -2,6 +2,7 @@ package com.yoho.search.consumer.index.increment.productIndex;
2 2
3 import java.util.ArrayList; 3 import java.util.ArrayList;
4 import java.util.List; 4 import java.util.List;
  5 +import java.util.Map;
5 6
6 import org.apache.commons.collections.CollectionUtils; 7 import org.apache.commons.collections.CollectionUtils;
7 import org.slf4j.Logger; 8 import org.slf4j.Logger;
@@ -82,7 +83,7 @@ public class ProductMqListener extends AbstractIndexMqListener { @@ -82,7 +83,7 @@ public class ProductMqListener extends AbstractIndexMqListener {
82 83
83 private void updateProductDataToEs(final Integer productId, Integer productSkn, boolean isUpdate) { 84 private void updateProductDataToEs(final Integer productId, Integer productSkn, boolean isUpdate) {
84 CostStatistics costStatistics = new CostStatistics(); 85 CostStatistics costStatistics = new CostStatistics();
85 - // 3、获取数据 86 + // 1、获取数据
86 List<Integer> ids = new ArrayList<>(); 87 List<Integer> ids = new ArrayList<>();
87 ids.add(productId); 88 ids.add(productId);
88 List<ProductIBO> productIBOs = productIndexIndexBuilder.getProductIBOs(ids); 89 List<ProductIBO> productIBOs = productIndexIndexBuilder.getProductIBOs(ids);
@@ -90,24 +91,24 @@ public class ProductMqListener extends AbstractIndexMqListener { @@ -90,24 +91,24 @@ public class ProductMqListener extends AbstractIndexMqListener {
90 return; 91 return;
91 } 92 }
92 ProductIBO productIBO = productIBOs.get(0); 93 ProductIBO productIBO = productIBOs.get(0);
93 - // 处理isNew（规则：首次上架7天内展示且折扣率小于88折）  
94 - productIBO.setIsnew("N"); 94 + logger.info("[step1=getProductIBO][productId={}][cost={}ms]", productId, costStatistics.getCost());
  95 +
  96 + // 2、构建ProductPrice
95 ProductPrice productPrice = productPriceService.getBySkn(productSkn); 97 ProductPrice productPrice = productPriceService.getBySkn(productSkn);
96 - if (productPrice != null && productPriceBuilder.isNew(productIBO.getFirstShelveTime(), productPrice.getRetailPrice(), productPrice.getSalesPrice())) {  
97 - productIBO.setIsnew("Y");  
98 - }  
99 - logger.info("[step3=getProductI][productId={}][cost={}ms]", productId, costStatistics.getCost()); 98 + Map<String, Object> productPriceModelMap = productPriceBuilder.getProductPriceModelMap(productId, productIBO.getFirstShelveTime(), productPrice);
  99 + logger.info("[step2=getProductPrice][productId={}][cost={}ms]", productId, costStatistics.getCost());
100 100
101 - // 4、更新到ES 101 + // 3、更新到ES
102 try { 102 try {
103 JSONObject jsonObject = (JSONObject) JSON.toJSON(productIBO); 103 JSONObject jsonObject = (JSONObject) JSON.toJSON(productIBO);
104 if (!isUpdate) { 104 if (!isUpdate) {
105 jsonObject.put("salesNum", 0); 105 jsonObject.put("salesNum", 0);
106 } 106 }
  107 + jsonObject.putAll(productPriceModelMap);
107 this.updateProductIndexWithDataMap(jsonObject, productId); 108 this.updateProductIndexWithDataMap(jsonObject, productId);
108 - logger.info("[step4=updateToEs][productId={}][cost={}ms]", productId, costStatistics.getCost()); 109 + logger.info("[step3=updateToEs][productId={}][cost={}ms]", productId, costStatistics.getCost());
109 } catch (Exception e) { 110 } catch (Exception e) {
110 - logger.error("[step4=updateToEs][productId={}][cost={}ms][execption={}]", productId, costStatistics.getCost(), e.getMessage()); 111 + logger.error("[step3=updateToEs][productId={}][cost={}ms][execption={}]", productId, costStatistics.getCost(), e.getMessage());
111 productIndexMqListener.sendProductIndexMessage(productId); 112 productIndexMqListener.sendProductIndexMessage(productId);
112 } 113 }
113 } 114 }
1 package com.yoho.search.consumer.index.increment.productIndex; 1 package com.yoho.search.consumer.index.increment.productIndex;
2 2
3 -import java.math.BigDecimal;  
4 import java.util.HashMap; 3 import java.util.HashMap;
5 import java.util.Map; 4 import java.util.Map;
6 5
@@ -17,7 +16,6 @@ import com.yoho.search.base.utils.ProductIndexEsField; @@ -17,7 +16,6 @@ import com.yoho.search.base.utils.ProductIndexEsField;
17 import com.yoho.search.consumer.index.increment.AbstractIndexMqListener; 16 import com.yoho.search.consumer.index.increment.AbstractIndexMqListener;
18 import com.yoho.search.consumer.service.base.ProductPriceService; 17 import com.yoho.search.consumer.service.base.ProductPriceService;
19 import com.yoho.search.consumer.service.base.ProductService; 18 import com.yoho.search.consumer.service.base.ProductService;
20 -import com.yoho.search.consumer.service.bo.ProductPriceBO;  
21 import com.yoho.search.consumer.service.logic.SpecialDealLogicService; 19 import com.yoho.search.consumer.service.logic.SpecialDealLogicService;
22 import com.yoho.search.consumer.service.logic.productIndex.viewBuilder.ProductPriceBuilder; 20 import com.yoho.search.consumer.service.logic.productIndex.viewBuilder.ProductPriceBuilder;
23 import com.yoho.search.dal.model.Product; 21 import com.yoho.search.dal.model.Product;
@@ -75,51 +73,20 @@ public class ProductPriceMqListener extends AbstractIndexMqListener { @@ -75,51 +73,20 @@ public class ProductPriceMqListener extends AbstractIndexMqListener {
75 73
76 // 2、更新ProductIndex 74 // 2、更新ProductIndex
77 begin = System.currentTimeMillis(); 75 begin = System.currentTimeMillis();
78 - Integer productId = productService.selectProductIdBySkn(productPrice.getProductSkn());  
79 - this.updateProductIndex(productId, productPrice); 76 + this.updateProductIndex(productPrice.getProductSkn(), productPrice);
80 logger.info("[func=updateData][step=updateProductIndex][productSkn={}][cost={}ms]", productPrice.getProductSkn(), this.getCost(begin)); 77 logger.info("[func=updateData][step=updateProductIndex][productSkn={}][cost={}ms]", productPrice.getProductSkn(), this.getCost(begin));
81 } 78 }
82 79
83 - private double getDoubleFromBigDecimal(BigDecimal bigDecimal) {  
84 - if (bigDecimal == null) {  
85 - return 0d;  
86 - }  
87 - return bigDecimal.doubleValue();  
88 - }  
89 -  
90 - private void updateProductIndex(Integer productId, ProductPrice pp) {  
91 - Map<String, Object> indexData = new HashMap<String, Object>();  
92 -  
93 - // 构造ProductPriceBO  
94 - ProductPriceBO productPriceBO = new ProductPriceBO(pp);  
95 - productPriceBuilder.buildProductPriceBO(productPriceBO);  
96 - indexData.put("productId", productId);  
97 - indexData.put("marketPrice", this.getDoubleFromBigDecimal(productPriceBO.getMarketPrice()));  
98 - indexData.put("salesPrice", this.getDoubleFromBigDecimal(productPriceBO.getSalesPrice()));  
99 - indexData.put("vipPrice", this.getDoubleFromBigDecimal(productPriceBO.getVipPrice()));  
100 - indexData.put("vipDiscountType", productPriceBO.getVipDiscountType());  
101 - indexData.put("vip1Price", this.getDoubleFromBigDecimal(productPriceBO.getVip1Price()));  
102 - indexData.put("vip2Price", this.getDoubleFromBigDecimal(productPriceBO.getVip2Price()));  
103 - indexData.put("vip3Price", this.getDoubleFromBigDecimal(productPriceBO.getVip3Price()));  
104 - indexData.put("studentPrice", this.getDoubleFromBigDecimal(productPriceBO.getStudentPrice()));  
105 -  
106 - indexData.put("isDiscount", productPriceBO.getIsDiscount());  
107 - indexData.put("specialoffer", productPriceBO.getSpecialoffer());  
108 - indexData.put("promotionDiscountInt", productPriceBO.getPromotionDiscountInt());  
109 - indexData.put("promotionDiscount", this.getDoubleFromBigDecimal(productPriceBO.getPromotionDiscount()));  
110 - indexData.put("isStudentPrice", productPriceBO.getIsStudentPrice());  
111 - indexData.put("isstudentrebate", productPriceBO.getIsstudentrebate());  
112 - indexData.put("vipLevels", productPriceBO.getVipLevels());  
113 - indexData.put("priceUpdateTime", productPriceBO.getUpdateTime());  
114 - Product product = productService.getById(productId);  
115 - if (product != null) {  
116 - indexData.put("isnew", productPriceBuilder.isNew(product.getFirstShelveTime(), productPriceBO.getMarketPrice(), productPriceBO.getSalesPrice()));  
117 - } else {  
118 - indexData.put("isnew", "N"); 80 + private void updateProductIndex(Integer productSkn, ProductPrice pp) {
  81 + Product product = productService.getBySkn(productSkn);
  82 + if (product == null) {
  83 + logger.warn("[func=updateData][step=updateProductIndex fail ][product is null ][productSkn is {}]", productSkn);
  84 + return;
119 } 85 }
120 - indexData.put(ProductIndexEsField.specialSearchFieldPrice, specialSearchFieldLogicService.getSpecialSearchFieldPrice(productPriceBO)); 86 + // 构造增量的建到Pi索引里的数据
  87 + Map<String, Object> indexData = productPriceBuilder.getProductPriceModelMap(product.getId(), product.getFirstShelveTime(), pp);
121 // 更新商品索引 88 // 更新商品索引
122 - this.updateProductIndexWithDataMap(indexData, productId); 89 + this.updateProductIndexWithDataMap(indexData, product.getId());
123 } 90 }
124 91
125 /** 92 /**
@@ -128,14 +95,14 @@ public class ProductPriceMqListener extends AbstractIndexMqListener { @@ -128,14 +95,14 @@ public class ProductPriceMqListener extends AbstractIndexMqListener {
128 private void updateProductIndexByClearPrice(Integer productId) { 95 private void updateProductIndexByClearPrice(Integer productId) {
129 Map<String, Object> indexData = new HashMap<String, Object>(30); 96 Map<String, Object> indexData = new HashMap<String, Object>(30);
130 indexData.put("productId", productId); 97 indexData.put("productId", productId);
131 - indexData.put("marketPrice", null);  
132 - indexData.put("salesPrice", null);  
133 - indexData.put("vipPrice", null);  
134 - indexData.put("vipDiscountType", null);  
135 - indexData.put("vip1Price", null);  
136 - indexData.put("vip2Price", null);  
137 - indexData.put("vip3Price", null);  
138 - indexData.put("studentPrice", null); 98 + indexData.put("marketPrice", 0);
  99 + indexData.put("salesPrice", 0);
  100 + indexData.put("vipPrice", 0);
  101 + indexData.put("vipDiscountType", 0);
  102 + indexData.put("vip1Price", 0);
  103 + indexData.put("vip2Price", 0);
  104 + indexData.put("vip3Price", 0);
  105 + indexData.put("studentPrice", 0);
139 // others 106 // others
140 indexData.put("isDiscount", "N"); 107 indexData.put("isDiscount", "N");
141 indexData.put("specialoffer", "N"); 108 indexData.put("specialoffer", "N");
1 package com.yoho.search.consumer.service.logic.productIndex.viewBuilder; 1 package com.yoho.search.consumer.service.logic.productIndex.viewBuilder;
2 2
  3 +import java.math.BigDecimal;
  4 +import java.math.RoundingMode;
  5 +import java.text.DecimalFormat;
  6 +import java.util.Date;
  7 +import java.util.HashMap;
  8 +import java.util.List;
  9 +import java.util.Map;
  10 +import java.util.stream.Collectors;
  11 +
  12 +import org.slf4j.Logger;
  13 +import org.slf4j.LoggerFactory;
  14 +import org.springframework.beans.factory.annotation.Autowired;
  15 +import org.springframework.stereotype.Component;
  16 +
3 import com.yoho.search.base.utils.DateUtil; 17 import com.yoho.search.base.utils.DateUtil;
4 import com.yoho.search.base.utils.MathUtils; 18 import com.yoho.search.base.utils.MathUtils;
  19 +import com.yoho.search.base.utils.ProductIndexEsField;
5 import com.yoho.search.consumer.service.bo.ProductIndexBO; 20 import com.yoho.search.consumer.service.bo.ProductIndexBO;
6 import com.yoho.search.consumer.service.bo.ProductPriceBO; 21 import com.yoho.search.consumer.service.bo.ProductPriceBO;
7 import com.yoho.search.consumer.service.logic.SpecialDealLogicService; 22 import com.yoho.search.consumer.service.logic.SpecialDealLogicService;
8 import com.yoho.search.consumer.service.logic.VipPriceLogicService; 23 import com.yoho.search.consumer.service.logic.VipPriceLogicService;
9 import com.yoho.search.dal.ProductPriceMapper; 24 import com.yoho.search.dal.ProductPriceMapper;
10 import com.yoho.search.dal.model.ProductPrice; 25 import com.yoho.search.dal.model.ProductPrice;
11 -import org.slf4j.Logger;  
12 -import org.slf4j.LoggerFactory;  
13 -import org.springframework.beans.factory.annotation.Autowired;  
14 -import org.springframework.stereotype.Component;  
15 -  
16 -import java.math.BigDecimal;  
17 -import java.math.RoundingMode;  
18 -import java.text.DecimalFormat;  
19 -import java.util.Date;  
20 -import java.util.List;  
21 -import java.util.Map;  
22 -import java.util.stream.Collectors;  
23 26
24 /** 27 /**
25 * Created by wangnan on 2017/1/6. 28 * Created by wangnan on 2017/1/6.
@@ -79,7 +82,8 @@ public class ProductPriceBuilder implements ViewBuilder { @@ -79,7 +82,8 @@ public class ProductPriceBuilder implements ViewBuilder {
79 double promotionDiscount = this.divide(3, productPriceBO.getSalesPrice(), productPriceBO.getMarketPrice()); 82 double promotionDiscount = this.divide(3, productPriceBO.getSalesPrice(), productPriceBO.getMarketPrice());
80 productPriceBO.setPromotionDiscount(this.getBigDecimalFromDouble(promotionDiscount)); 83 productPriceBO.setPromotionDiscount(this.getBigDecimalFromDouble(promotionDiscount));
81 // 3、设置学生价相关属性 84 // 3、设置学生价相关属性
82 - productPriceBO.setIsStudentPrice(productPriceBO.getStudentPrice() != null ? "Y" : "N"); 85 + BigDecimal studentPrice = productPriceBO.getStudentPrice();
  86 + productPriceBO.setIsStudentPrice(studentPrice== null || studentPrice.compareTo(BigDecimal.ZERO)==0 ? "N" : "Y");
83 productPriceBO.setIsstudentrebate(productPriceBO.getStudentCoinRate() == null || productPriceBO.getStudentCoinRate().compareTo(BigDecimal.ZERO) == 0 ? "N" : "Y"); 87 productPriceBO.setIsstudentrebate(productPriceBO.getStudentCoinRate() == null || productPriceBO.getStudentCoinRate().compareTo(BigDecimal.ZERO) == 0 ? "N" : "Y");
84 } 88 }
85 89
@@ -122,6 +126,39 @@ public class ProductPriceBuilder implements ViewBuilder { @@ -122,6 +126,39 @@ public class ProductPriceBuilder implements ViewBuilder {
122 productIndexBO.setSpecialSearchFieldPrice(specialSearchFieldLogicService.getSpecialSearchFieldPrice(productPriceBO)); 126 productIndexBO.setSpecialSearchFieldPrice(specialSearchFieldLogicService.getSpecialSearchFieldPrice(productPriceBO));
123 } 127 }
124 128
  129 + public Map<String, Object> getProductPriceModelMap(Integer productId, Integer firstShelveTime, ProductPrice pp) {
  130 + Map<String, Object> indexData = new HashMap<String, Object>();
  131 + indexData.put("isnew", "N");
  132 + if (pp == null) {
  133 + return indexData;
  134 + }
  135 + // 构造ProductPriceBO
  136 + ProductPriceBO productPriceBO = new ProductPriceBO(pp);
  137 + this.buildProductPriceBO(productPriceBO);
  138 + indexData.put("productId", productId);
  139 + indexData.put("marketPrice", this.getDoubleFromBigDecimal(productPriceBO.getMarketPrice()));
  140 + indexData.put("salesPrice", this.getDoubleFromBigDecimal(productPriceBO.getSalesPrice()));
  141 + indexData.put("vipPrice", this.getDoubleFromBigDecimal(productPriceBO.getVipPrice()));
  142 + indexData.put("vipDiscountType", productPriceBO.getVipDiscountType());
  143 + indexData.put("vip1Price", this.getDoubleFromBigDecimal(productPriceBO.getVip1Price()));
  144 + indexData.put("vip2Price", this.getDoubleFromBigDecimal(productPriceBO.getVip2Price()));
  145 + indexData.put("vip3Price", this.getDoubleFromBigDecimal(productPriceBO.getVip3Price()));
  146 + indexData.put("studentPrice", this.getDoubleFromBigDecimal(productPriceBO.getStudentPrice()));
  147 +
  148 + indexData.put("isDiscount", productPriceBO.getIsDiscount());
  149 + indexData.put("specialoffer", productPriceBO.getSpecialoffer());
  150 + indexData.put("promotionDiscountInt", productPriceBO.getPromotionDiscountInt());
  151 + indexData.put("promotionDiscount", this.getDoubleFromBigDecimal(productPriceBO.getPromotionDiscount()));
  152 + indexData.put("isStudentPrice", productPriceBO.getIsStudentPrice());
  153 + indexData.put("isstudentrebate", productPriceBO.getIsstudentrebate());
  154 + indexData.put("vipLevels", productPriceBO.getVipLevels());
  155 + indexData.put("priceUpdateTime", productPriceBO.getUpdateTime());
  156 + if (firstShelveTime != null) {
  157 + indexData.put("isnew", this.isNew(firstShelveTime, productPriceBO.getMarketPrice(), productPriceBO.getSalesPrice()));
  158 + }
  159 + indexData.put(ProductIndexEsField.specialSearchFieldPrice, specialSearchFieldLogicService.getSpecialSearchFieldPrice(productPriceBO));
  160 + return indexData;
  161 + }
125 162
126 /** 163 /**
127 * isNew 标签逻辑 164 * isNew 标签逻辑
  1 +index:
  2 + analysis:
  3 + tokenizer:
  4 + my_pinyin:
  5 + type: pinyin
  6 + first_letter: prefix
  7 + padding_char: ''
  8 + pinyin_first_letter:
  9 + type: pinyin
  10 + first_letter: only
  11 + simple_pinyin:
  12 + type: pinyin
  13 + first_letter: none
  14 + padding_char: ''
  15 + ngram_1_to_2:
  16 + type: nGram
  17 + min_gram: 1
  18 + max_gram: 2
  19 + ngram_1_to_3:
  20 + type: nGram
  21 + min_gram: 1
  22 + max_gram: 3
  23 + filter:
  24 + ngram_min_3:
  25 + max_gram: 10
  26 + min_gram: 3
  27 + type: nGram
  28 + ngram_min_2:
  29 + max_gram: 10
  30 + min_gram: 2
  31 + type: nGram
  32 + ngram_min_1:
  33 + max_gram: 10
  34 + min_gram: 1
  35 + type: nGram
  36 + min2_length:
  37 + min: 2
  38 + max: 4
  39 + type: length
  40 + min3_length:
  41 + min: 3
  42 + max: 4
  43 + type: length
  44 + pinyin_first_letter:
  45 + type: pinyin
  46 + first_letter: only
  47 + my_stop:
  48 + type: stop
  49 + stopwords_path: custom/stopwords.txt
  50 + my_synonym:
  51 + type: synonym
  52 + synonyms_path: custom/synonyms.dic
  53 + analyzer:
  54 + lowercase_standard:
  55 + type: custom
  56 + filter:
  57 + - lowercase
  58 + tokenizer: standard
  59 + lowercase_keyword:
  60 + type: custom
  61 + filter:
  62 + - lowercase
  63 + tokenizer: keyword
  64 + lowercase_whitespace:
  65 + type: custom
  66 + filter:
  67 + - lowercase
  68 + tokenizer: whitespace
  69 + lowercase_keyword_ngram:
  70 + type: custom
  71 + filter:
  72 + - lowercase
  73 + - stop
  74 + - trim
  75 + - unique
  76 + tokenizer: ngram_1_to_3
  77 + ik_max_word:
  78 + type: ik
  79 + use_smart: false
  80 + ik_max_word_syno:
  81 + type: custom
  82 + tokenizer: ik
  83 + filter: [my_synonym]
  84 + use_smart: false
  85 + ik_smart:
  86 + type: ik
  87 + use_smart: true
  88 + ik_complex:
  89 + type: custom
  90 + tokenizer: ik_smart
  91 + filter:
  92 + - lowercase
  93 + - ik_dyn_synonym
  94 + - lowercase
  95 + - my_stop
  96 + - unique
  97 + ik_complex_search:
  98 + type: custom
  99 + tokenizer: ik_smart
  100 + filter:
  101 + - lowercase
  102 + - my_stop
  103 + - unique
  104 + comma_spliter:
  105 + type: pattern
  106 + pattern: "[,|\\s]+"
  107 + pinyin_analyzer:
  108 + type: custom
  109 + tokenizer: simple_pinyin
  110 + filter:
  111 + - standard
  112 + - word_delimiter
  113 + - lowercase
  114 + - trim
  115 + - unique
  116 +
  117 +
  118 +index.analysis.analyzer.default.type: keyword
  119 +
  120 +index.search.slowlog.level: TRACE
  121 +index.search.slowlog.threshold.query.warn: 1s
  122 +index.search.slowlog.threshold.query.info: 800ms
  123 +index.search.slowlog.threshold.query.debug: 500ms
  124 +index.search.slowlog.threshold.query.trace: 200ms
  125 +index.search.slowlog.threshold.fetch.warn: 1s
  126 +index.search.slowlog.threshold.fetch.info: 800ms
  127 +index.search.slowlog.threshold.fetch.debug: 500ms
  128 +index.search.slowlog.threshold.fetch.trace: 200ms