From 17b977ef94f97cf1de4463b10e17892fccaa1a2a Mon Sep 17 00:00:00 2001 From: Chopper Date: Fri, 9 Jul 2021 14:46:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E7=B4=A2=E5=BC=95=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E8=BF=9B=E8=A1=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../syslog/interceptor/SystemLogAspect.java | 2 +- .../entity/vo}/SystemLogVO.java | 2 +- .../permission/service/SystemLogService.java | 2 +- .../serviceimpl/SystemLogServiceImpl.java | 2 +- .../search/entity/dos/EsGoodsIndex.java | 27 ++++++++++--------- 5 files changed, 19 insertions(+), 16 deletions(-) rename framework/src/main/java/cn/lili/modules/{base/entity/systemlog => permission/entity/vo}/SystemLogVO.java (97%) diff --git a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java index cf0b6d3e..aec4771b 100644 --- a/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java +++ b/framework/src/main/java/cn/lili/common/aop/syslog/interceptor/SystemLogAspect.java @@ -7,7 +7,7 @@ import cn.lili.common.security.enums.UserEnums; import cn.lili.common.utils.IpHelper; import cn.lili.common.utils.SpelUtil; 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.permission.service.SystemLogService; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/cn/lili/modules/base/entity/systemlog/SystemLogVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/base/entity/systemlog/SystemLogVO.java rename to framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java index aa73148f..8fea6475 100644 --- a/framework/src/main/java/cn/lili/modules/base/entity/systemlog/SystemLogVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java @@ -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 com.fasterxml.jackson.annotation.JsonFormat; diff --git a/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java b/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java index b1f21715..cb768ab8 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java @@ -2,7 +2,7 @@ package cn.lili.modules.permission.service; import cn.lili.common.vo.PageVO; 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 java.util.List; diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java index dd6724b0..e5459685 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java @@ -3,7 +3,7 @@ package cn.lili.modules.permission.serviceimpl; import cn.lili.common.utils.StringUtils; import cn.lili.common.vo.PageVO; 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 com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java index e3b72a27..89148a92 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java @@ -102,7 +102,7 @@ public class EsGoodsIndex implements Serializable { /** * 分类path */ - @Field(type = FieldType.Keyword, fielddata = true) + @Field(type = FieldType.Keyword) @ApiModelProperty("分类path") private String categoryPath; @@ -290,18 +290,21 @@ public class EsGoodsIndex implements Serializable { List attributes = new ArrayList<>(); //循环参数分组 goodsParamDTOS.forEach(goodsParamGroup -> { - //循环分组的内容 - goodsParamGroup.getGoodsParamsItemDTOList().forEach(goodsParam -> { - //如果字段需要索引，则增加索引字段 - if (goodsParam.getIsIndex() != null && goodsParam.getIsIndex() == 1) { - EsGoodsAttribute attribute = new EsGoodsAttribute(); - attribute.setType(1); - attribute.setName(goodsParam.getParamName()); - attribute.setValue(goodsParam.getParamValue()); - attributes.add(attribute); + //如果参数有配置，则增加索引 + if (goodsParamGroup.getGoodsParamsItemDTOList() != null && !goodsParamGroup.getGoodsParamsItemDTOList().isEmpty()) { + //循环分组的内容 + goodsParamGroup.getGoodsParamsItemDTOList().forEach(goodsParam -> { + //如果字段需要索引，则增加索引字段 + if (goodsParam.getIsIndex() != null && goodsParam.getIsIndex() == 1) { + EsGoodsAttribute attribute = new EsGoodsAttribute(); + attribute.setType(1); + attribute.setName(goodsParam.getParamName()); + attribute.setValue(goodsParam.getParamValue()); + attributes.add(attribute); + } } - } - ); + ); + } }); this.attrList = attributes;