feat: 自定义es及接口完成

2024-03-06 17:18:23 +08:00
parent 964c4beb11
commit ce4387c7e3
20 changed files with 866 additions and 112 deletions
--- a/qing-yu-club-subject/qing-yu-club-infra/pom.xml
+++ b/qing-yu-club-subject/qing-yu-club-infra/pom.xml
@@ -57,9 +57,24 @@
            <version>1.0-SNAPSHOT</version>
        </dependency>
        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-            <version>2.4.2</version>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>7.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-client</artifactId>
+            <version>7.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>elasticsearch-rest-high-level-client</artifactId>
+            <version>7.5.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
        </dependency>
    </dependencies>
 </project>
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/entity/EsSubjectFields.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/entity/EsSubjectFields.java
@@ -0,0 +1,23 @@
+package com.landaiqing.subject.infra.basic.entity;
+
+public class EsSubjectFields {
+
+    public static final String DOC_ID = "doc_id";
+
+    public static final String SUBJECT_ID = "subject_id";
+
+    public static final String SUBJECT_NAME = "subject_name";
+
+    public static final String SUBJECT_ANSWER = "subject_answer";
+
+    public static final String SUBJECT_TYPE = "subject_type";
+
+    public static final String CREATE_USER = "create_user";
+
+    public static final String CREATE_TIME = "create_time";
+
+    public static final String[] FIELD_QUERY = {
+            SUBJECT_ID, SUBJECT_NAME, SUBJECT_ANSWER, SUBJECT_TYPE, DOC_ID, CREATE_USER, CREATE_TIME
+    };
+
+}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/entity/SubjectInfoEs.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/entity/SubjectInfoEs.java
@@ -1,14 +1,10 @@
 package com.landaiqing.subject.infra.basic.entity;

-import lombok.AllArgsConstructor;
+import com.landaiqing.subject.common.entity.PageInfo;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-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;

-import java.util.Date;
+import java.io.Serializable;
+import java.math.BigDecimal;

 /**
 * @Classname SubjectInfoEs
@@ -16,27 +12,26 @@ import java.util.Date;
 * @BelongsPackage: com.landaiqing.subject.infra.basic.entity
 * @Author: landaiqing
 * @CreateTime: 2024-03-04  18:14
- * @Description: TODO
+ * @Description: Es实体类
 * @Version: 1.0
 */
@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Document(indexName = "subject_index",createIndex = false)
-public class SubjectInfoEs {
-    @Field(type = FieldType.Long)
-    @Id
-    private Long id;
+public class SubjectInfoEs extends PageInfo implements Serializable {
+    private Long subjectId;
+
+    private Long docId;

-    @Field(type = FieldType.Text, analyzer = "ik_smart")
    private String subjectName;

-    @Field(type = FieldType.Text, analyzer = "ik_smart")
    private String subjectAnswer;

-    @Field(type = FieldType.Keyword)
    private String createUser;

-    @Field(type = FieldType.Date,index = false)
-    private Date createTime;
+    private Long createTime;
+
+    private Integer subjectType;
+
+    private String keyWord;
+
+    private BigDecimal score;
 }
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsClusterConfig.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsClusterConfig.java
@@ -1,14 +1,28 @@
 package com.landaiqing.subject.infra.basic.es;

+import lombok.Data;
+
+import java.io.Serializable;
+
 /**
 * @Classname EsClusterConfig
 * @BelongsProject: qing-yu-club
 * @BelongsPackage: com.landaiqing.subject.infra.basic.es
 * @Author: landaiqing
 * @CreateTime: 2024-03-05  21:15
- * @Description: TODO
+ * @Description: Es集群类
 * @Version: 1.0
 */
-public class EsClusterConfig {
+@Data
+public class EsClusterConfig implements Serializable {
+    /**
+     * @description: 集群名称
+     */
    private String name;
+    /**
+     * @description: 集群节点
+     */
+    private String nodes;
+
+
 }
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsConfigProperties.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsConfigProperties.java
@@ -0,0 +1,30 @@
+package com.landaiqing.subject.infra.basic.es;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Classname EsConfigProperties
+ * @BelongsProject: qing-yu-club
+ * @BelongsPackage: com.landaiqing.subject.infra.basic.es
+ * @Author: landaiqing
+ * @CreateTime: 2024-03-05  21:18
+ * @Description: TODO
+ * @Version: 1.0
+ */
+@Component
+@ConfigurationProperties(prefix = "es.cluster")
+public class EsConfigProperties {
+    private List<EsClusterConfig> esClusterConfigs=new ArrayList<>();
+
+    public List<EsClusterConfig> getEsClusterConfigs() {
+        return esClusterConfigs;
+    }
+
+    public void setEsClusterConfigs(List<EsClusterConfig> esClusterConfigs) {
+        this.esClusterConfigs = esClusterConfigs;
+    }
+}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsIndexInfo.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsIndexInfo.java
@@ -0,0 +1,28 @@
+package com.landaiqing.subject.infra.basic.es;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Classname EsIndexInfo
+ * @BelongsProject: qing-yu-club
+ * @BelongsPackage: com.landaiqing.subject.infra.basic.es
+ * @Author: landaiqing
+ * @CreateTime: 2024-03-05  21:23
+ * @Description: 索引类
+ * @Version: 1.0
+ */
+@Data
+public class EsIndexInfo implements Serializable {
+    /** 
+     * @description: 集群名称
+     */ 
+    private String clusterName;
+    /**
+     * @description: 索引名称
+     */
+    private String indexName;
+
+
+}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsRestClient.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsRestClient.java
@@ -0,0 +1,332 @@
+package com.landaiqing.subject.infra.basic.es;
+
+import com.alibaba.fastjson.JSON;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.http.HttpHost;
+import org.elasticsearch.action.bulk.BulkRequest;
+import org.elasticsearch.action.bulk.BulkResponse;
+import org.elasticsearch.action.delete.DeleteRequest;
+import org.elasticsearch.action.delete.DeleteResponse;
+import org.elasticsearch.action.get.GetRequest;
+import org.elasticsearch.action.get.GetResponse;
+import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.action.update.UpdateRequest;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.index.reindex.BulkByScrollResponse;
+import org.elasticsearch.index.reindex.DeleteByQueryRequest;
+import org.elasticsearch.search.Scroll;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.fetch.subphase.FetchSourceContext;
+import org.elasticsearch.search.sort.ScoreSortBuilder;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.swing.*;
+import java.util.*;
+
+/**
+ * @Classname EsRestClient
+ * @BelongsProject: qing-yu-club
+ * @BelongsPackage: com.landaiqing.subject.infra.basic.es
+ * @Author: landaiqing
+ * @CreateTime: 2024-03-05  21:32
+ * @Description: TODO
+ * @Version: 1.0
+ */
+@Component
+@Slf4j
+public class EsRestClient {
+
+    private static Map<String, RestHighLevelClient> clientMap = new HashMap<>();
+    @Resource
+    private EsConfigProperties esConfigProperties;
+
+    private static final RequestOptions COMMON_OPTIONS;
+
+    static {
+        RequestOptions.Builder builder = RequestOptions.DEFAULT.toBuilder();
+        COMMON_OPTIONS = builder.build();
+    }
+
+    @PostConstruct
+    public void initialize() {
+        List<EsClusterConfig> esClusterConfigs = esConfigProperties.getEsClusterConfigs();
+        for (EsClusterConfig esClusterConfig : esClusterConfigs) {
+            log.info("initialize.config.name: {},node:{}", esClusterConfig.getName(), esClusterConfig.getNodes());
+            RestHighLevelClient restHighLevelClient = initRestClient(esClusterConfig);
+            if (restHighLevelClient != null) {
+                clientMap.put(esClusterConfig.getName(), restHighLevelClient);
+            } else {
+                log.error("config.name: {},node:{}.initError", esClusterConfig.getName(), esClusterConfig.getNodes());
+            }
+        }
+
+
+    }
+
+    private RestHighLevelClient initRestClient(EsClusterConfig esClusterConfig) {
+        String[] ipPortArr = esClusterConfig.getNodes().split(",");
+        List<HttpHost> httpHostList = new ArrayList<>(ipPortArr.length);
+        for (String ipPort : ipPortArr) {
+            String[] ipPortInfo = ipPort.split(":");
+            if (ipPortInfo.length == 2) {
+                HttpHost httpHost = new HttpHost(ipPortInfo[0], NumberUtils.toInt(ipPortInfo[1]));
+                httpHostList.add(httpHost);
+            }
+        }
+        HttpHost[] httpHosts = new HttpHost[httpHostList.size()];
+        httpHostList.toArray(httpHosts);
+
+        RestClientBuilder builder = RestClient.builder(httpHosts);
+        RestHighLevelClient restHighLevelClient = new RestHighLevelClient(builder);
+        return restHighLevelClient;
+
+    }
+
+    private static RestHighLevelClient getClient(String clusterName) {
+        return clientMap.get(clusterName);
+    }
+
+    /**
+     * @description: 创建文档
+     * @param: [esIndexInfo, esSourceData]
+     * @return: boolean
+     * @author landaiqing
+     * @date: 2024/3/5 22:03
+     */
+    public static boolean insertDoc(EsIndexInfo esIndexInfo, EsSourceData esSourceData) {
+        try {
+            IndexRequest indexRequest = new IndexRequest(esIndexInfo.getIndexName());
+            indexRequest.source(esSourceData.getData());
+            indexRequest.id(esSourceData.getDocId());
+            getClient(esIndexInfo.getClusterName()).index(indexRequest, COMMON_OPTIONS);
+            return true;
+        } catch (Exception e) {
+            log.error("insertDoc.exception:{}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    /**
+     * @description: 更新文档
+     * @param: [esIndexInfo, esSourceData]
+     * @return: boolean
+     * @author landaiqing
+     * @date: 2024/3/5 22:30
+     */
+    public static boolean updateDoc(EsIndexInfo esIndexInfo, EsSourceData esSourceData) {
+        try {
+            UpdateRequest updateRequest = new UpdateRequest();
+            updateRequest.index(esIndexInfo.getIndexName());
+            updateRequest.id(esSourceData.getDocId());
+            updateRequest.doc(esSourceData.getData());
+            getClient(esIndexInfo.getClusterName()).update(updateRequest, COMMON_OPTIONS);
+            return true;
+        } catch (Exception e) {
+            log.error("updateDoc.exception:{}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    /**
+     * @description: 批量更新文档
+     * @param: [esIndexInfo, esSourceDataList]
+     * @return: boolean
+     * @author landaiqing
+     * @date: 2024/3/5 22:31
+     */
+    public static boolean batchUpdateDoc(EsIndexInfo esIndexInfo,
+                                         List<EsSourceData> esSourceDataList) {
+        try {
+            boolean flag = false;
+            BulkRequest bulkRequest = new BulkRequest();
+            for (EsSourceData esSourceData : esSourceDataList) {
+                String docId = esSourceData.getDocId();
+                if (StringUtils.isNotBlank(docId)) {
+                    UpdateRequest updateRequest = new UpdateRequest();
+                    updateRequest.index(esIndexInfo.getIndexName());
+                    updateRequest.id(esSourceData.getDocId());
+                    updateRequest.doc(esSourceData.getData());
+                    bulkRequest.add(updateRequest);
+                    flag = true;
+                }
+            }
+            if (flag) {
+                BulkResponse bulk = getClient(esIndexInfo.getClusterName()).bulk(bulkRequest, COMMON_OPTIONS);
+                if (bulk.hasFailures()) {
+                    return false;
+                }
+            }
+            return true;
+        } catch (Exception e) {
+            log.error("batchUpdateDoc.exception:{}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    /**
+     * @description: 删除文档
+     * @param: [esIndexInfo]
+     * @return: boolean
+     * @author landaiqing
+     * @date: 2024/3/5 22:03
+     */
+    public static boolean delete(EsIndexInfo esIndexInfo) {
+        try {
+            DeleteByQueryRequest deleteByQueryRequest =
+                    new DeleteByQueryRequest(esIndexInfo.getClusterName());
+            deleteByQueryRequest.setQuery(QueryBuilders.matchAllQuery());
+            BulkByScrollResponse response = getClient(esIndexInfo.getClusterName()).deleteByQuery(
+                    deleteByQueryRequest, COMMON_OPTIONS
+            );
+            long deleted = response.getDeleted();
+            log.info("deleted.size:{}", deleted);
+            return true;
+        } catch (Exception e) {
+            log.error("delete.exception:{}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    /**
+     * @description: 删除单个文档
+     * @param: [esIndexInfo, docId]
+     * @return: boolean
+     * @author landaiqing
+     * @date: 2024/3/5 22:06
+     */
+    public static boolean deleteDoc(EsIndexInfo esIndexInfo, String docId) {
+        try {
+            DeleteRequest deleteRequest = new DeleteRequest(esIndexInfo.getIndexName());
+            deleteRequest.id(docId);
+            DeleteResponse response = getClient(esIndexInfo.getClusterName()).delete(deleteRequest, COMMON_OPTIONS);
+            log.info("deleteDoc.response:{}", JSON.toJSONString(response));
+            return true;
+        } catch (Exception e) {
+            log.error("deleteDoc.exception:{}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    /**
+     * @description: 文档是否存在
+     * @param: [esIndexInfo, docId]
+     * @return: boolean
+     * @author landaiqing
+     * @date: 2024/3/5 22:08
+     */
+    public static boolean isExistDocById(EsIndexInfo esIndexInfo, String docId) {
+        try {
+            GetRequest getRequest = new GetRequest(esIndexInfo.getIndexName());
+            getRequest.id(docId);
+            return getClient(esIndexInfo.getClusterName()).exists(getRequest, COMMON_OPTIONS);
+        } catch (Exception e) {
+            log.error("isExistDocById.exception:{}", e.getMessage(), e);
+        }
+        return false;
+    }
+
+    /**
+     * @description: 通过id查找文档
+     * @param: [esIndexInfo, docId]
+     * @return: java.util.Map<java.lang.String, java.lang.Object>
+     * @author landaiqing
+     * @date: 2024/3/5 22:10
+     */
+    public static Map<String, Object> getDocById(EsIndexInfo esIndexInfo, String docId) {
+        try {
+            GetRequest getRequest = new GetRequest(esIndexInfo.getIndexName());
+            getRequest.id(docId);
+            GetResponse response = getClient(esIndexInfo.getClusterName()).get(getRequest, COMMON_OPTIONS);
+            Map<String, Object> source = response.getSource();
+            return source;
+        } catch (Exception e) {
+            log.error("getDocById.exception:{}", e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * @description: 通过指定字段查找
+     * @param: [esIndexInfo, docId, fields]
+     * @return: java.util.Map<java.lang.String, java.lang.Object>
+     * @author landaiqing
+     * @date: 2024/3/5 22:13
+     */
+    public static Map<String, Object> getDocById(EsIndexInfo esIndexInfo, String docId,
+                                                 String[] fields) {
+        try {
+            GetRequest getRequest = new GetRequest(esIndexInfo.getIndexName());
+            getRequest.id(docId);
+            FetchSourceContext fetchSourceContext = new FetchSourceContext(true, fields, null);
+            getRequest.fetchSourceContext(fetchSourceContext);
+            GetResponse response = getClient(esIndexInfo.getClusterName()).get(getRequest, COMMON_OPTIONS);
+            Map<String, Object> source = response.getSource();
+            return source;
+        } catch (Exception e) {
+            log.error("getDocById.exception:{}", e.getMessage(), e);
+        }
+        return null;
+    }
+
+    /**
+     * @description: 查询文档
+     * @param: [esIndexInfo, esSearchRequest]
+     * @return: org.elasticsearch.action.search.SearchResponse
+     * @author landaiqing
+     * @date: 2024/3/5 22:27
+     */
+    public static SearchResponse searchWithTermQuery(EsIndexInfo esIndexInfo, EsSearchRequest esSearchRequest) {
+        try {
+            BoolQueryBuilder bq = esSearchRequest.getBq();
+            String[] fields = esSearchRequest.getFields();
+            int from = esSearchRequest.getFrom();
+            int size = esSearchRequest.getSize();
+            Long minutes = esSearchRequest.getMinutes();
+            Boolean needScroll = esSearchRequest.getNeedScroll();
+            String sortName = esSearchRequest.getSortName();
+            SortOrder sortOrder = esSearchRequest.getSortOrder();
+
+            SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+            searchSourceBuilder.query(bq);
+            searchSourceBuilder.fetchSource(fields, null).from(from).size(size);
+
+            if (Objects.nonNull(esSearchRequest.getHighlightBuilder())) {
+                searchSourceBuilder.highlighter(esSearchRequest.getHighlightBuilder());
+            }
+
+            if (StringUtils.isNotBlank(sortName)) {
+                searchSourceBuilder.sort(sortName);
+            }
+
+            searchSourceBuilder.sort(new ScoreSortBuilder().order(org.elasticsearch.search.sort.SortOrder.DESC));
+
+            SearchRequest searchRequest = new SearchRequest();
+            searchRequest.searchType(SearchType.DEFAULT);
+            searchRequest.indices(esIndexInfo.getIndexName());
+            searchRequest.source(searchSourceBuilder);
+            if (needScroll) {
+                Scroll scroll = new Scroll(TimeValue.timeValueMinutes(minutes));
+                searchRequest.scroll(scroll);
+            }
+            SearchResponse search = getClient(esIndexInfo.getClusterName()).search(searchRequest, COMMON_OPTIONS);
+            return search;
+        } catch (Exception e) {
+            log.error("searchWithTermQuery.exception:{}", e.getMessage(), e);
+        }
+        return null;
+    }
+
+}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsSearchRequest.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsSearchRequest.java
@@ -0,0 +1,56 @@
+package com.landaiqing.subject.infra.basic.es;
+
+import lombok.Data;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+
+import javax.swing.*;
+
+/**
+ * @Classname EsSearchRequest
+ * @BelongsProject: qing-yu-club
+ * @BelongsPackage: com.landaiqing.subject.infra.basic.es
+ * @Author: landaiqing
+ * @CreateTime: 2024-03-05  21:25
+ * @Description: TODO
+ * @Version: 1.0
+ */
+@Data
+public class EsSearchRequest {
+    /**
+     * @description: 查询条件
+     */
+    private BoolQueryBuilder bq;
+    /**
+     * @description: 查询字段
+     */
+    private String[] fields;
+    /**
+     * @description: 页数
+     */
+    private int from;
+    /**
+     * @description: 条数
+     */
+    private int size;
+    /**
+     * @description: 需要快照
+     */
+    private Boolean needScroll;
+    /**
+     * @description: 快照缓存时间
+     */
+    private Long minutes;
+    /**
+     * @description: 排序字段
+     */
+    private String sortName;
+    /**
+     * @description: 排序类型
+     */
+    private SortOrder sortOrder;
+    /**
+     * @description: 高亮builder
+     */
+    private HighlightBuilder highlightBuilder;
+}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsSourceData.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/es/EsSourceData.java
@@ -0,0 +1,24 @@
+package com.landaiqing.subject.infra.basic.es;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * @Classname EsSourceData
+ * @BelongsProject: qing-yu-club
+ * @BelongsPackage: com.landaiqing.subject.infra.basic.es
+ * @Author: landaiqing
+ * @CreateTime: 2024-03-05  21:30
+ * @Description: TODO
+ * @Version: 1.0
+ */
+@Data
+public class EsSourceData implements Serializable {
+    private String docId;
+
+    private Map<String,Object> data;
+
+
+}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/esRepo/SubjectEsRepository.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/esRepo/SubjectEsRepository.java
@@ -1,16 +0,0 @@
-package com.landaiqing.subject.infra.basic.esRepo;
-
-import com.landaiqing.subject.infra.basic.entity.SubjectInfoEs;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-
-/**
- * @Classname SubjectEsRepository
- * @BelongsProject: qing-yu-club
- * @BelongsPackage: com.landaiqing.subject.infra.basic.esRepo
- * @Author: landaiqing
- * @CreateTime: 2024-03-04  18:19
- * @Description: TODO
- * @Version: 1.0
- */
-public interface SubjectEsRepository extends ElasticsearchRepository<SubjectInfoEs,Long> {
-}
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/service/SubjectEsService.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/service/SubjectEsService.java
@@ -1,5 +1,8 @@
 package com.landaiqing.subject.infra.basic.service;

+import com.landaiqing.subject.common.entity.PageResult;
+import com.landaiqing.subject.infra.basic.entity.SubjectInfoEs;
+
 /**
 * @Classname SubjectEsService
 * @BelongsProject: qing-yu-club
@@ -10,9 +13,7 @@ package com.landaiqing.subject.infra.basic.service;
 * @Version: 1.0
 */
 public interface SubjectEsService {
-    void createIndex();
-    void addDocs();
+    boolean insert(SubjectInfoEs subjectInfoEs);

-    void search();
-    void find();
+    PageResult<SubjectInfoEs> querySubjectList(SubjectInfoEs subjectInfoEs);
 }
--- a/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/service/impl/SubjectEsServiceImpl.java
+++ b/qing-yu-club-subject/qing-yu-club-infra/src/main/java/com/landaiqing/subject/infra/basic/service/impl/SubjectEsServiceImpl.java
@@ -1,24 +1,31 @@
 package com.landaiqing.subject.infra.basic.service.impl;

-import com.alibaba.fastjson.JSON;
+import com.landaiqing.subject.common.entity.PageResult;
+import com.landaiqing.subject.common.enums.SubjectInfoTypeEnum;
+import com.landaiqing.subject.infra.basic.entity.EsSubjectFields;
 import com.landaiqing.subject.infra.basic.entity.SubjectInfoEs;
-import com.landaiqing.subject.infra.basic.esRepo.SubjectEsRepository;
+import com.landaiqing.subject.infra.basic.es.EsIndexInfo;
+import com.landaiqing.subject.infra.basic.es.EsRestClient;
+import com.landaiqing.subject.infra.basic.es.EsSearchRequest;
+import com.landaiqing.subject.infra.basic.es.EsSourceData;
 import com.landaiqing.subject.infra.basic.service.SubjectEsService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.text.Text;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
-import org.springframework.data.elasticsearch.core.IndexOperations;
-import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.document.Document;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;

-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;

 /**
 * @Classname SubjectEsServiceImpl
@@ -32,42 +39,133 @@ import java.util.List;
@Service
@Slf4j
 public class SubjectEsServiceImpl implements SubjectEsService {
-    @Resource
-    private ElasticsearchRestTemplate elasticsearchRestTemplate;
-    @Resource
-    private SubjectEsRepository subjectEsRepository;
-
    @Override
-    public void createIndex() {
-        IndexOperations indexOperations =
-                elasticsearchRestTemplate.indexOps(SubjectInfoEs.class);
-        indexOperations.create();
-        Document mapping = indexOperations.createMapping(SubjectInfoEs.class);
-        indexOperations.putMapping(mapping);
+    public boolean insert(SubjectInfoEs subjectInfoEs) {
+        EsSourceData esSourceData = new EsSourceData();
+        Map<String, Object> data = convert2EsSourceData(subjectInfoEs);
+        esSourceData.setDocId(subjectInfoEs.getDocId().toString());
+        esSourceData.setData(data);
+        return EsRestClient.insertDoc(getEsIndexInfo(), esSourceData);
+    }
+
+    private Map<String, Object> convert2EsSourceData(SubjectInfoEs subjectInfoEs) {
+        Map<String, Object> data = new HashMap<>();
+        data.put(EsSubjectFields.SUBJECT_ID, subjectInfoEs.getSubjectId());
+        data.put(EsSubjectFields.DOC_ID, subjectInfoEs.getDocId());
+        data.put(EsSubjectFields.SUBJECT_NAME, subjectInfoEs.getSubjectName());
+        data.put(EsSubjectFields.SUBJECT_ANSWER, subjectInfoEs.getSubjectAnswer());
+        data.put(EsSubjectFields.SUBJECT_TYPE, subjectInfoEs.getSubjectType());
+        data.put(EsSubjectFields.CREATE_USER, subjectInfoEs.getCreateUser());
+        data.put(EsSubjectFields.CREATE_TIME, subjectInfoEs.getCreateTime());
+        return data;
    }

    @Override
-    public void addDocs() {
-        List<SubjectInfoEs> list = new LinkedList<>();
-        list.add(new SubjectInfoEs(1L, "redis 是什么", "redis是一个缓存", "landaiqing", new Date()));
-        list.add(new SubjectInfoEs(2L, "mysql 是什么", "mysql是一个数据库", "landaiqing", new Date()));
-        subjectEsRepository.saveAll(list);
-    }
+    public PageResult<SubjectInfoEs> querySubjectList(SubjectInfoEs req) {
+        PageResult<SubjectInfoEs> pageResult = new PageResult<>();
+        EsSearchRequest esSearchRequest = createSearchListQuery(req);
+        SearchResponse searchResponse = EsRestClient.searchWithTermQuery(getEsIndexInfo(), esSearchRequest);

-    @Override
-    public void search() {
-        NativeSearchQuery nativeSearchQuery = new NativeSearchQueryBuilder()
-                .withQuery(QueryBuilders.matchQuery("subjectName", "redis")).build();
-        SearchHits<SubjectInfoEs> search = elasticsearchRestTemplate.search(nativeSearchQuery, SubjectInfoEs.class);
-        List<SearchHit<SubjectInfoEs>> searchHits = search.getSearchHits();
-        log.info("searchHits:{}", JSON.toJSONString(searchHits));
-    }
-
-    @Override
-    public void find() {
-        Iterable<SubjectInfoEs> all = subjectEsRepository.findAll();
-        for (SubjectInfoEs subjectInfoEs: all){
-            log.info("subjectInfoEs：{}",JSON.toJSONString(subjectInfoEs));
+        List<SubjectInfoEs> subjectInfoEsList = new LinkedList<>();
+        SearchHits searchHits = searchResponse.getHits();
+        if (searchHits == null || searchHits.getHits() == null) {
+            pageResult.setPageNo(req.getPageNo());
+            pageResult.setPageSize(req.getPageSize());
+            pageResult.setRecords(subjectInfoEsList);
+            pageResult.setTotal(0);
+            return pageResult;
        }
+        SearchHit[] hits = searchHits.getHits();
+        for (SearchHit hit : hits) {
+            SubjectInfoEs subjectInfoEs = convertResult(hit);
+            if (Objects.nonNull(subjectInfoEs)) {
+                subjectInfoEsList.add(subjectInfoEs);
+            }
+        }
+        pageResult.setPageNo(req.getPageNo());
+        pageResult.setPageSize(req.getPageSize());
+        pageResult.setRecords(subjectInfoEsList);
+        pageResult.setTotal(Long.valueOf(searchHits.getTotalHits().value).intValue());
+        return pageResult;
+    }
+
+    private SubjectInfoEs convertResult(SearchHit hit) {
+        Map<String, Object> sourceAsMap = hit.getSourceAsMap();
+        if (CollectionUtils.isEmpty(sourceAsMap)) {
+            return null;
+        }
+        SubjectInfoEs result = new SubjectInfoEs();
+        result.setSubjectId(MapUtils.getLong(sourceAsMap, EsSubjectFields.SUBJECT_ID));
+        result.setSubjectName(MapUtils.getString(sourceAsMap, EsSubjectFields.SUBJECT_NAME));
+
+        result.setSubjectAnswer(MapUtils.getString(sourceAsMap, EsSubjectFields.SUBJECT_ANSWER));
+
+        result.setDocId(MapUtils.getLong(sourceAsMap, EsSubjectFields.DOC_ID));
+        result.setSubjectType(MapUtils.getInteger(sourceAsMap, EsSubjectFields.SUBJECT_TYPE));
+        result.setScore(new BigDecimal(String.valueOf(hit.getScore())).multiply(new BigDecimal("100.00")
+                .setScale(2, RoundingMode.HALF_UP)));
+
+        //处理name的高亮
+        Map<String, HighlightField> highlightFields = hit.getHighlightFields();
+        HighlightField subjectNameField = highlightFields.get(EsSubjectFields.SUBJECT_NAME);
+        if (Objects.nonNull(subjectNameField)) {
+            Text[] fragments = subjectNameField.getFragments();
+            StringBuilder subjectNameBuilder = new StringBuilder();
+            for (Text fragment : fragments) {
+                subjectNameBuilder.append(fragment);
+            }
+            result.setSubjectName(subjectNameBuilder.toString());
+        }
+
+        //处理答案高亮
+        HighlightField subjectAnswerField = highlightFields.get(EsSubjectFields.SUBJECT_ANSWER);
+        if (Objects.nonNull(subjectAnswerField)) {
+            Text[] fragments = subjectAnswerField.getFragments();
+            StringBuilder subjectAnswerBuilder = new StringBuilder();
+            for (Text fragment : fragments) {
+                subjectAnswerBuilder.append(fragment);
+            }
+            result.setSubjectAnswer(subjectAnswerBuilder.toString());
+        }
+
+        return result;
+    }
+
+    private EsSearchRequest createSearchListQuery(SubjectInfoEs req) {
+        EsSearchRequest esSearchRequest = new EsSearchRequest();
+        BoolQueryBuilder bq = new BoolQueryBuilder();
+        MatchQueryBuilder subjectNameQueryBuilder =
+                QueryBuilders.matchQuery(EsSubjectFields.SUBJECT_NAME, req.getKeyWord());
+
+        bq.should(subjectNameQueryBuilder);
+        subjectNameQueryBuilder.boost(2);
+
+        MatchQueryBuilder subjectAnswerQueryBuilder =
+                QueryBuilders.matchQuery(EsSubjectFields.SUBJECT_ANSWER, req.getKeyWord());
+        bq.should(subjectAnswerQueryBuilder);
+
+        MatchQueryBuilder subjectTypeQueryBuilder =
+                QueryBuilders.matchQuery(EsSubjectFields.SUBJECT_TYPE, SubjectInfoTypeEnum.BRIEF.getCode());
+        bq.must(subjectTypeQueryBuilder);
+        bq.minimumShouldMatch(1);
+
+        HighlightBuilder highlightBuilder = new HighlightBuilder().field("*").requireFieldMatch(false);
+        highlightBuilder.preTags("<span style = \"color:red\">");
+        highlightBuilder.postTags("</span>");
+
+        esSearchRequest.setBq(bq);
+        esSearchRequest.setHighlightBuilder(highlightBuilder);
+        esSearchRequest.setFields(EsSubjectFields.FIELD_QUERY);
+        esSearchRequest.setFrom((req.getPageNo() - 1) * req.getPageSize());
+        esSearchRequest.setSize(req.getPageSize());
+        esSearchRequest.setNeedScroll(false);
+        return esSearchRequest;
+    }
+
+    private EsIndexInfo getEsIndexInfo() {
+        EsIndexInfo esIndexInfo = new EsIndexInfo();
+        esIndexInfo.setClusterName("5fdd534ef33c");
+        esIndexInfo.setIndexName("subject_index");
+        return esIndexInfo;
    }
 }