From 5418ea7855d16dcc0169d5ed554f7a23c4b55532 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 02 十二月 2025 10:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/EsModel.java | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 64 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..0be4d6e 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,12 +2,13 @@
import lombok.Data;
-import org.springframework.data.annotation.Id;
+import org.joda.time.DateTime;
import org.springframework.data.elasticsearch.annotations.Document;
import org.springframework.data.elasticsearch.annotations.Field;
import org.springframework.data.elasticsearch.annotations.FieldType;
+import java.sql.Timestamp;
import java.util.Date;
/**
@@ -16,55 +17,105 @@
* @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;
+
+ /** 澶囩敤7 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private String by7;
+
+
+ /** 澶囩敤8*/
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by8;
+
+ /** 澶囩敤9 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by9;
+
+ /** 澶囩敤10 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by10;
+
+ /** 澶囩敤11 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by11;
+
+ /** 澶囩敤12 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by12;
+
+ /** 澶囩敤13 */
+ @Field(index = true,type = FieldType.Text,analyzer = "ik_max_word")
+ private int by13;
+
+// /** 澶囩敤14 */
+// @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+// private Date by14;
+//
+// /** 澶囩敤15 */
+// @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+// private Date by15;
+
+// /** 澶囩敤16 */
+// @Field(index = true,type = FieldType.Date,analyzer = "ik_max_wor")
+// private Timestamp by16;
+
+
}
--
Gitblit v1.9.1