caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 优化日志搜索，关闭商品删除索引

Browse Source
This commit is contained in:
misworga831 2023-03-14 19:37:22 +08:00
parent a81faf4ba4
commit c793c47d45
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java
View File

@ -133,7 +133,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
//获取商品ID列表 //获取商品ID列表
List<String> list = this.baseMapper.getGoodsIdByStoreId(storeId); List<String> list = this.baseMapper.getGoodsIdByStoreId(storeId);
//下架店铺下的商品 //下架店铺下的商品
updateGoodsMarketAble(list, GoodsStatusEnum.DOWN, "店铺关闭"); this.updateGoodsMarketAbleByStoreId(storeId, GoodsStatusEnum.DOWN, "店铺关闭");
applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("下架商品", applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("下架商品",
rocketmqCustomProperties.getGoodsTopic(), GoodsTagsEnum.DOWN.name(), JSONUtil.toJsonStr(list))); rocketmqCustomProperties.getGoodsTopic(), GoodsTagsEnum.DOWN.name(), JSONUtil.toJsonStr(list)));

20
framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java
View File

@ -1,6 +1,5 @@
package cn.lili.modules.permission.serviceimpl; package cn.lili.modules.permission.serviceimpl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.vo.PageVO; import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.SearchVO; import cn.lili.common.vo.SearchVO;
@ -9,7 +8,9 @@ import cn.lili.modules.permission.repository.SystemLogRepository;
import cn.lili.modules.permission.service.SystemLogService; import cn.lili.modules.permission.service.SystemLogService;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.elasticsearch.common.unit.Fuzziness;
import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.index.query.MultiMatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortBuilders;
import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.search.sort.SortOrder;
@ -82,25 +83,22 @@ public class SystemLogServiceImpl implements SystemLogService {
} }
if (CharSequenceUtil.isNotEmpty(operatorName)) { if (CharSequenceUtil.isNotEmpty(operatorName)) {
nativeSearchQueryBuilder.withFilter(QueryBuilders.wildcardQuery("username", "*" + operatorName + "*")); nativeSearchQueryBuilder.withQuery(QueryBuilders.matchQuery("username", operatorName));
} }
if (CharSequenceUtil.isNotEmpty(key)) { if (CharSequenceUtil.isNotEmpty(key)) {
BoolQueryBuilder filterBuilder = new BoolQueryBuilder(); MultiMatchQueryBuilder multiMatchQueryBuilder = QueryBuilders.multiMatchQuery(key, "requestUrl", "requestParam", "responseBody", "name");
filterBuilder.should(QueryBuilders.wildcardQuery("requestUrl", "*" + key + "*")) multiMatchQueryBuilder.fuzziness(Fuzziness.AUTO);
.should(QueryBuilders.wildcardQuery("requestParam", "*" + key + "*")) nativeSearchQueryBuilder.withFilter(multiMatchQueryBuilder);
.should(QueryBuilders.wildcardQuery("responseBody", "*" + key + "*"))
.should(QueryBuilders.wildcardQuery("name", "*" + key + "*"));
nativeSearchQueryBuilder.withFilter(filterBuilder);
} }
//时间有效性判定 //时间有效性判定
if (searchVo.getConvertStartDate() != null && searchVo.getConvertEndDate() != null) { if (searchVo.getConvertStartDate() != null && searchVo.getConvertEndDate() != null) {
BoolQueryBuilder filterBuilder = new BoolQueryBuilder(); BoolQueryBuilder filterBuilder = new BoolQueryBuilder();
//大于方法 //大于方法
filterBuilder.must( filterBuilder.filter(
QueryBuilders.rangeQuery("createTime") QueryBuilders.rangeQuery("createTime")
.gte(DateUtil.format(searchVo.getConvertStartDate(), "dd/MM/yyyy")) .gte(searchVo.getConvertStartDate().getTime())
.lte(DateUtil.format(searchVo.getConvertEndDate(), "dd/MM/yyyy")).format("dd/MM/yyyy||yyyy")); .lte(searchVo.getConvertEndDate().getTime()));
nativeSearchQueryBuilder.withFilter(filterBuilder); nativeSearchQueryBuilder.withFilter(filterBuilder);
} }

9
framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java
View File

@ -235,11 +235,16 @@ public class StoreServiceImpl extends ServiceImpl<StoreMapper, Store> implements
public boolean disable(String id) { public boolean disable(String id) {
Store store = this.getById(id); Store store = this.getById(id);
if (store != null) { if (store != null) {
store.setStoreDisable(StoreStatusEnum.CLOSED.value());
LambdaUpdateWrapper<Store> storeLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
storeLambdaUpdateWrapper.eq(Store::getId, id);
storeLambdaUpdateWrapper.set(Store::getStoreDisable, StoreStatusEnum.CLOSED.value());
boolean update = this.update(storeLambdaUpdateWrapper);
//下架所有此店铺商品 //下架所有此店铺商品
if (update) {
goodsService.underStoreGoods(id); goodsService.underStoreGoods(id);
return this.updateById(store); }
return update;
} }
throw new ServiceException(ResultCode.STORE_NOT_EXIST); throw new ServiceException(ResultCode.STORE_NOT_EXIST);