From d221c28fa06bd7f400b9e6510e8d3be30fe97f9f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 18 九月 2023 12:21:00 +0800
Subject: [PATCH] 34678913687

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
index d32642f..f2c93da 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java
@@ -2,7 +2,6 @@
 
 
 import lombok.Data;
-import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -16,55 +15,70 @@
  * @author feige
  * @date 2023-09-14
  */
-@Document(indexName = "allsearch")
+@Document(indexName = "allsearchdata")
 @Data
 public class EsModel {
 
     /*** 绱㈠紩id*/
-    @Id
     @Field(type = FieldType.Text)
     private String id;
 
     /**** es涓搴旂殑鏁版嵁搴撲笟鍔″崟鎹甶d*/
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Long)
     private Long ctId;
 
+    /**** es涓搴旂殑鏁版嵁鎵�灞炲搴璱d*/
+    @Field(index = true,type = FieldType.Long)
+    private Long fid;
+
     /**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨勪笟鍔℃暟鎹簱琛ㄥ悕绉�*/
-    @Field(analyzer = "ik_max_word")
+    @Field(type = FieldType.Text,analyzer = "ik_max_word")
     private String ctTableName;
 
     /**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨� 涓氬姟绠�绉�*/
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
     private String ctName;
 
 
     /**** es涓笟鍔℃暟鎹� 瀵瑰簲鐨� 涓氬姟鍐呭璇︾粏淇℃伅*/
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text
+            ,analyzer = "ik_max_word")
     private String ctContent;
 
 
     /** 澶囨敞 */
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
     private String remark;
 
     /** 澶囩敤1 */
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
     private String by1;
 
     /** 澶囩敤2 */
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
     private String by2;
 
     /** 澶囩敤3 */
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
     private String by3;
 
     /** 澶囩敤4 */
-    @Field(analyzer = "ik_max_word")
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
     private String by4;
 
     /** 澶囩敤5 */
-    @Field(analyzer = "ik_max_word")
+    @Field(type = FieldType.Text,analyzer = "ik_max_word")
     private String by5;
 
+    /** 澶囩敤6 */
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+    private String by6;
+
+    /** 澶囩敤6 */
+    @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+    private String by7;
+
+
+
+
 }

--
Gitblit v1.9.1