code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!20 add elasticsearch progress

Browse Source 
Merge pull request !20 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep
2021-08-11 18:18:15 +00:00
committed by Gitee
parent 8532400b82 48146edee9
commit dbc5305ea7
7 changed files with 92 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
framework/src/main/java/cn/lili/cache/CachePrefix.java vendored
View File

@@ -455,6 +455,16 @@ public enum CachePrefix {
*/
ARTICLE_CACHE,
/**
* 初始化索引
*/
INIT_INDEX_PROCESS,
/**
* 初始化索引标示
*/
INIT_INDEX_FLAG,
/**
* 店铺分类
*/

4
framework/src/main/java/cn/lili/common/enums/ResultCode.java
View File

@@ -439,8 +439,8 @@ public enum ResultCode {
CUSTOM_WORDS_EXIST_ERROR(90000, "当前自定义分词已存在！"),
CUSTOM_WORDS_NOT_EXIST_ERROR(90001, "当前自定义分词不存在！"),
CUSTOM_WORDS_SECRET_KEY_ERROR(90002, "秘钥验证失败！"),
CONNECT_NOT_EXIST(90000, "登录方式不存在"),
CONNECT_NOT_EXIST(90000, "登录方式不存在！"),
ELASTICSEARCH_INDEX_INIT_ERROR(90003, "索引初始化失败！"),
;
private final Integer code;

3
framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java
View File

@@ -253,6 +253,9 @@ public abstract class BaseElasticsearchService {
" }\n" +
" }\n" +
" },\n" +
" \"recommend\": {\n" +
" \"type\": \"boolean\"\n" +
" },\n" +
" \"selfOperated\": {\n" +
" \"type\": \"boolean\"\n" +
" },\n" +

3
framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java
View File

@@ -23,6 +23,9 @@ public class EsGoodsSearchDTO {
@ApiModelProperty(value = "品牌,可以多选 品牌Id@品牌Id@品牌Id")
private String brandId;
@ApiModelProperty("是否为推荐商品")
private Boolean recommend;
@ApiModelProperty(value = "价格", example = "10_30")
private String price;

38
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java
View File

@@ -6,18 +6,20 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.elasticsearch.BaseElasticsearchService;
import cn.lili.elasticsearch.EsSuffix;
import cn.lili.elasticsearch.config.ElasticsearchProperties;
import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.entity.dos.GoodsWords;
import cn.lili.modules.goods.entity.dto.GoodsParamsDTO;
import cn.lili.modules.goods.entity.enums.GoodsWordsTypeEnum;
import cn.lili.modules.goods.service.GoodsWordsService;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.dto.BasePromotion;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.modules.promotion.service.PromotionService;
import cn.lili.modules.search.entity.dos.EsGoodsAttribute;
import cn.lili.modules.search.entity.dos.EsGoodsIndex;
@@ -36,7 +38,6 @@ import org.elasticsearch.search.SearchHit;
import org.mybatis.spring.MyBatisSystemException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -65,7 +66,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
@Autowired
private PromotionService promotionService;
@Autowired
private ElasticsearchRestTemplate elasticsearchRestTemplate;
private Cache<Object> cache;
@Override
public void addIndex(EsGoodsIndex goods) {
@@ -152,6 +153,9 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
@Override
public void initIndex(List<EsGoodsIndex> goodsIndexList) {
if (goodsIndexList == null || goodsIndexList.isEmpty()) {
return;
}
//索引名称拼接
String indexName = elasticsearchProperties.getIndexPrefix() + "_" + EsSuffix.GOODS_INDEX_NAME;
@@ -165,12 +169,32 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
//如果索引不存在，则创建索引
createIndexRequest(indexName);
if (goodsIndexList != null && !goodsIndexList.isEmpty()) {
Map<String, Integer> resultMap = new HashMap<>();
final String KEY_SUCCESS = "success";
final String KEY_FAIL = "fail";
final String KEY_PROCESSED = "processed";
resultMap.put("total", goodsIndexList.size());
resultMap.put(KEY_SUCCESS, 0);
resultMap.put(KEY_FAIL, 0);
resultMap.put(KEY_PROCESSED, 0);
cache.put(CachePrefix.INIT_INDEX_PROCESS.getPrefix() + "", resultMap);
cache.put(CachePrefix.INIT_INDEX_FLAG.getPrefix(), true);
if (!goodsIndexList.isEmpty()) {
goodsIndexRepository.deleteAll();
for (EsGoodsIndex goodsIndex : goodsIndexList) {
addIndex(goodsIndex);
try {
addIndex(goodsIndex);
resultMap.put(KEY_SUCCESS, resultMap.get(KEY_SUCCESS) + 1);
} catch (Exception e) {
log.error("商品{}生成索引错误！", goodsIndex);
resultMap.put(KEY_FAIL, resultMap.get(KEY_FAIL) + 1);
}
resultMap.put(KEY_PROCESSED, resultMap.get(KEY_PROCESSED) + 1);
cache.put(CachePrefix.INIT_INDEX_PROCESS.getPrefix(), resultMap);
}
}
cache.put(CachePrefix.INIT_INDEX_PROCESS.getPrefix(), resultMap);
cache.put(CachePrefix.INIT_INDEX_FLAG.getPrefix(), false);
}
@Override
@@ -440,7 +464,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements
}
}
//移除促销信息
promotionMap.keySet().removeAll(removeKeys);
removeKeys.forEach(promotionMap.keySet()::remove);
}
}

3
framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
View File

@@ -342,6 +342,9 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
String[] brands = searchDTO.getBrandId().split("@");
filterBuilder.must(QueryBuilders.termsQuery("brandId", brands));
}
if (searchDTO.getRecommend() != null) {
filterBuilder.filter(QueryBuilders.termQuery("storeId", searchDTO.getRecommend()));
}
//规格项判定
if (searchDTO.getNameIds() != null && !searchDTO.getNameIds().isEmpty()) {
filterBuilder.must(QueryBuilders.nestedQuery(ATTR_PATH, QueryBuilders.termsQuery("attrList.nameId", searchDTO.getNameIds()), ScoreMode.None));