对索引生成判定进行处理

KBI73 · Jul 9, 2021 · 17b977e · 17b977e
1 parent a599fb9
commit 17b977e
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
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
@@ -7,7 +7,7 @@
 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/...es/base/entity/systemlog/SystemLogVO.java → ...les/permission/entity/vo/SystemLogVO.java b/...es/base/entity/systemlog/SystemLogVO.java → ...les/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
@@ -2,7 +2,7 @@
 
 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
@@ -3,7 +3,7 @@
 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
@@ -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 EsGoodsIndex(GoodsSku sku, List<GoodsParamsDTO> goodsParamDTOS) {
             List<EsGoodsAttribute> 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;