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

对索引生成判定进行处理

Browse Source
This commit is contained in:
Chopper 2021-07-09 14:46:03 +08:00
parent a599fb9d01
commit 17b977ef94
5 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java
View File

@ -7,7 +7,7 @@ import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.utils.IpHelper; import cn.lili.common.utils.IpHelper;
import cn.lili.common.utils.SpelUtil; import cn.lili.common.utils.SpelUtil;
import cn.lili.common.utils.ThreadPoolUtil; import cn.lili.common.utils.ThreadPoolUtil;
import cn.lili.modules.base.entity.systemlog.SystemLogVO; import cn.lili.modules.permission.entity.vo.SystemLogVO;
import cn.lili.modules.connect.util.IpUtils; import cn.lili.modules.connect.util.IpUtils;
import cn.lili.modules.permission.service.SystemLogService; import cn.lili.modules.permission.service.SystemLogService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
framework/src/main/java/cn/lili/modules/base/entity/systemlog/SystemLogVO.java → framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java
View File

@ -1,4 +1,4 @@
package cn.lili.modules.base.entity.systemlog; package cn.lili.modules.permission.entity.vo;
import cn.lili.common.utils.ObjectUtil; import cn.lili.common.utils.ObjectUtil;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;

2
framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java
View File

@ -2,7 +2,7 @@ package cn.lili.modules.permission.service;
import cn.lili.common.vo.PageVO; import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.SearchVO; import cn.lili.common.vo.SearchVO;
import cn.lili.modules.base.entity.systemlog.SystemLogVO; import cn.lili.modules.permission.entity.vo.SystemLogVO;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import java.util.List; import java.util.List;

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

@ -3,7 +3,7 @@ package cn.lili.modules.permission.serviceimpl;
import cn.lili.common.utils.StringUtils; import cn.lili.common.utils.StringUtils;
import cn.lili.common.vo.PageVO; import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.SearchVO; import cn.lili.common.vo.SearchVO;
import cn.lili.modules.base.entity.systemlog.SystemLogVO; import cn.lili.modules.permission.entity.vo.SystemLogVO;
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;

27
framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java
View File

@ -102,7 +102,7 @@ public class EsGoodsIndex implements Serializable {
/** /**
* 分类path * 分类path
*/ */
@Field(type = FieldType.Keyword, fielddata = true) @Field(type = FieldType.Keyword)
@ApiModelProperty("分类path") @ApiModelProperty("分类path")
private String categoryPath; private String categoryPath;
@ -290,18 +290,21 @@ public class EsGoodsIndex implements Serializable {
List<EsGoodsAttribute> attributes = new ArrayList<>(); List<EsGoodsAttribute> attributes = new ArrayList<>();
//循环参数分组 //循环参数分组
goodsParamDTOS.forEach(goodsParamGroup -> { goodsParamDTOS.forEach(goodsParamGroup -> {
//循环分组的内容 //如果参数有配置，则增加索引
goodsParamGroup.getGoodsParamsItemDTOList().forEach(goodsParam -> { if (goodsParamGroup.getGoodsParamsItemDTOList() != null && !goodsParamGroup.getGoodsParamsItemDTOList().isEmpty()) {
//如果字段需要索引，则增加索引字段 //循环分组的内容
if (goodsParam.getIsIndex() != null && goodsParam.getIsIndex() == 1) { goodsParamGroup.getGoodsParamsItemDTOList().forEach(goodsParam -> {
EsGoodsAttribute attribute = new EsGoodsAttribute(); //如果字段需要索引，则增加索引字段
attribute.setType(1); if (goodsParam.getIsIndex() != null && goodsParam.getIsIndex() == 1) {
attribute.setName(goodsParam.getParamName()); EsGoodsAttribute attribute = new EsGoodsAttribute();
attribute.setValue(goodsParam.getParamValue()); attribute.setType(1);
attributes.add(attribute); attribute.setName(goodsParam.getParamName());
attribute.setValue(goodsParam.getParamValue());
attributes.add(attribute);
}
} }
} );
); }
}); });
this.attrList = attributes; this.attrList = attributes;