es优化

novel-common/src/main/java/com/java2nb/novel/core/enums/ResponseStatus.java

@@ -58,13 +58,16 @@ public enum ResponseStatus {
     , BOOKNAME_EXISTS(4003,"已发布过同名小说！")
 
     ,
+    /**
+     * 搜索引擎相关错误
+     * */
+    ES_SEARCH_FAIL(9001,"密码错误！"),
 
 
     /**
      * 其他通用错误
      * */
     PASSWORD_ERROR(88001,"密码错误！");
-
     private int code;
     private String msg;
 

novel-front/src/main/java/com/java2nb/novel/core/listener/BookVisitAddListener.java

@@ -4,6 +4,7 @@ import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.SearchService;
 import com.java2nb.novel.vo.EsBookVO;
 import com.rabbitmq.client.Channel;
 import io.searchbox.client.JestClient;
@@ -34,7 +35,7 @@ public class BookVisitAddListener {
 
     private final CacheService cacheService;
 
-    private final JestClient jestClient;
+    private final SearchService searchService;
 
 
 
@@ -73,11 +74,7 @@ public class BookVisitAddListener {
             try {
                 Thread.sleep(1000 * 5);
                 Book book = bookService.queryBookDetail(bookId);
-                EsBookVO esBookVO = new EsBookVO();
+                searchService.importToEs(book);
-                BeanUtils.copyProperties(book, esBookVO, "lastIndexUpdateTime");
-                esBookVO.setLastIndexUpdateTime(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(book.getLastIndexUpdateTime()));
-                Index action = new Index.Builder(esBookVO).index("novel").type("book").id(book.getId().toString()).build();
-                jestClient.execute(action);
                 cacheService.set(CacheKey.ES_IS_UPDATE_VISIT + bookId, "1", 60 * 60);
             }catch (Exception e){
                 cacheService.del(CacheKey.ES_IS_UPDATE_VISIT + bookId);

novel-front/src/main/java/com/java2nb/novel/core/schedule/BookToEsSchedule.java

@@ -5,6 +5,7 @@ import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.utils.BeanUtil;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.SearchService;
 import com.java2nb.novel.vo.EsBookVO;
 import io.searchbox.client.JestClient;
 import io.searchbox.core.DocumentResult;
@@ -37,7 +38,9 @@ public class BookToEsSchedule {
 
     private final CacheService cacheService;
 
-    private final JestClient jestClient;
+
+
+    private final SearchService searchService;
 
 
     /**
@@ -57,16 +60,8 @@ public class BookToEsSchedule {
 
                 List<Book> books = bookService.queryBookByUpdateTimeByPage(lastDate, 100);
                 for (Book book : books) {
-                    //导入到ES
+                    searchService.importToEs(book);
-                    EsBookVO esBookVO = new EsBookVO();
-                    BeanUtils.copyProperties(book, esBookVO, "lastIndexUpdateTime");
-                    esBookVO.setLastIndexUpdateTime(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(book.getLastIndexUpdateTime()));
-                    Index action = new Index.Builder(esBookVO).index("novel").type("book").id(book.getId().toString()).build();
-
-                    jestClient.execute(action);
-
                     lastDate = book.getUpdateTime();
-
                     Thread.sleep(1000);
 
                 }

novel-front/src/main/java/com/java2nb/novel/service/SearchService.java

@@ -0,0 +1,20 @@
+package com.java2nb.novel.service;
+
+
+import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.search.BookSP;
+
+/**
+ * @author 11797
+ */
+public interface SearchService {
+
+    /**
+     * 导入到es
+     * @param book 小说数据
+     */
+    void importToEs(Book book);
+
+    PageInfo searchBook(BookSP params, int page, int pageSize);
+}

novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java

@@ -15,6 +15,7 @@ import com.java2nb.novel.mapper.*;
 import com.java2nb.novel.search.BookSP;
 import com.java2nb.novel.service.AuthorService;
 import com.java2nb.novel.service.BookService;
+import com.java2nb.novel.service.SearchService;
 import com.java2nb.novel.vo.BookCommentVO;
 import com.java2nb.novel.vo.BookSettingVO;
 import com.java2nb.novel.vo.BookVO;
@@ -89,7 +90,7 @@ public class BookServiceImpl implements BookService {
 
     private final AuthorService authorService;
 
-    private final JestClient jestClient;
+    private final SearchService searchService;
 
 
     @SneakyThrows
@@ -200,139 +201,8 @@ public class BookServiceImpl implements BookService {
 
 
             try {
-                List<EsBookVO> bookList = new ArrayList<>(0);
+                return searchService.searchBook(params,page,pageSize);
 
-                //使用搜索引擎搜索
-                BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
-                // 构造查询哪个字段
-                if (StringUtils.isNoneBlank(params.getKeyword())) {
-                    boolQueryBuilder = boolQueryBuilder.must(QueryBuilders.queryStringQuery(params.getKeyword()));
-                }
-
-                // 作品方向
-                if (params.getWorkDirection() != null) {
-                    boolQueryBuilder.filter(QueryBuilders.termQuery("workDirection", params.getWorkDirection()));
-                }
-
-                // 分类
-                if (params.getCatId() != null) {
-                    boolQueryBuilder.filter(QueryBuilders.termQuery("catId", params.getCatId()));
-                }
-                if (params.getBookStatus() != null) {
-                    boolQueryBuilder.filter(QueryBuilders.termQuery("bookStatus", params.getBookStatus()));
-                }
-
-                if (params.getWordCountMin() == null) {
-                    params.setWordCountMin(0);
-                }
-                if (params.getWordCountMax() == null) {
-                    params.setWordCountMax(Integer.MAX_VALUE);
-                }
-
-                boolQueryBuilder.filter(QueryBuilders.rangeQuery("wordCount").gte(params.getWordCountMin()).lte(params.getWordCountMax()));
-
-                if (params.getUpdateTimeMin() != null) {
-                    boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(params.getUpdateTimeMin()));
-                }
-
-
-
-                SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
-                searchSourceBuilder.query(boolQueryBuilder);
-
-
-                Count count = new Count.Builder().addIndex("novel").addType("book")
-                        .query(searchSourceBuilder.toString()).build();
-                CountResult results = jestClient.execute(count);
-                Double total = results.getCount();
-
-
-                // 高亮字段
-                HighlightBuilder highlightBuilder = new HighlightBuilder();
-                highlightBuilder.field("authorName");
-                highlightBuilder.field("bookName");
-                highlightBuilder.field("bookDesc");
-                highlightBuilder.field("lastIndexName");
-                highlightBuilder.field("catName");
-                highlightBuilder.preTags("<span style='color:red'>").postTags("</span>");
-                highlightBuilder.fragmentSize(20000);
-                searchSourceBuilder.highlighter(highlightBuilder);
-
-
-                //设置排序
-                if (params.getSort() != null) {
-                    searchSourceBuilder.sort(StringUtil.camelName(params.getSort()), SortOrder.DESC);
-                }
-
-                // 设置分页
-                searchSourceBuilder.from((page - 1) * pageSize);
-                searchSourceBuilder.size(pageSize);
-
-                // 构建Search对象
-                Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex("novel").addType("book").build();
-                log.debug(search.toString());
-                SearchResult result;
-                result = jestClient.execute(search);
-                if (result.isSucceeded()) {
-                    log.debug(result.getJsonString());
-
-                    Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class);
-                    if (resultMap.get("hits") != null) {
-                        Map hitsMap = (Map) resultMap.get("hits");
-                        if (hitsMap.size() > 0 && hitsMap.get("hits") != null) {
-                            List hitsList = (List) hitsMap.get("hits");
-                            if (hitsList.size() > 0 && result.getSourceAsString() != null) {
-
-                                JavaType jt = new ObjectMapper().getTypeFactory().constructParametricType(ArrayList.class, EsBookVO.class);
-                                bookList = new ObjectMapper().readValue("[" + result.getSourceAsString() + "]", jt);
-
-                                if (bookList != null) {
-                                    for (int i = 0; i < bookList.size(); i++) {
-                                        hitsMap = (Map) hitsList.get(i);
-                                        Map highlightMap = (Map) hitsMap.get("highlight");
-                                        if (highlightMap != null && highlightMap.size() > 0) {
-
-                                            List<String> authorNameList = (List<String>) highlightMap.get("authorName");
-                                            if (authorNameList != null && authorNameList.size() > 0) {
-                                                bookList.get(i).setAuthorName(authorNameList.get(0));
-                                            }
-
-                                            List<String> bookNameList = (List<String>) highlightMap.get("bookName");
-                                            if (bookNameList != null && bookNameList.size() > 0) {
-                                                bookList.get(i).setBookName(bookNameList.get(0));
-                                            }
-
-                                            List<String> bookDescList = (List<String>) highlightMap.get("bookDesc");
-                                            if (bookDescList != null && bookDescList.size() > 0) {
-                                                bookList.get(i).setBookDesc(bookDescList.get(0));
-                                            }
-
-                                            List<String> lastIndexNameList = (List<String>) highlightMap.get("lastIndexName");
-                                            if (lastIndexNameList != null && lastIndexNameList.size() > 0) {
-                                                bookList.get(i).setLastIndexName(lastIndexNameList.get(0));
-                                            }
-
-                                            List<String> catNameList = (List<String>) highlightMap.get("catName");
-                                            if (catNameList != null && catNameList.size() > 0) {
-                                                bookList.get(i).setCatName(catNameList.get(0));
-                                            }
-
-
-                                        }
-                                    }
-
-
-                                }
-                            }
-                        }
-                    }
-
-                    PageInfo<EsBookVO> pageInfo = new PageInfo<>(bookList);
-                    pageInfo.setTotal(total.longValue());
-                    pageInfo.setPageNum(page);
-                    pageInfo.setPageSize(pageSize);
-                    return pageInfo;
-                }
             }catch (Exception e){
                 log.error(e.getMessage(),e);
             }

novel-front/src/main/java/com/java2nb/novel/service/impl/SearchServiceImpl.java

@@ -0,0 +1,199 @@
+package com.java2nb.novel.service.impl;
+
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.core.enums.ResponseStatus;
+import com.java2nb.novel.core.exception.BusinessException;
+import com.java2nb.novel.core.utils.StringUtil;
+import com.java2nb.novel.entity.Book;
+import com.java2nb.novel.search.BookSP;
+import com.java2nb.novel.service.SearchService;
+import com.java2nb.novel.vo.EsBookVO;
+import io.searchbox.client.JestClient;
+import io.searchbox.core.*;
+import lombok.RequiredArgsConstructor;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author 11797
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class SearchServiceImpl implements SearchService {
+
+    private final String INDEX = "novel";
+
+    private final String TYPE = "book";
+
+    private final JestClient jestClient;
+
+
+    @Override
+    @SneakyThrows
+    public void importToEs(Book book) {
+        //导入到ES
+        EsBookVO esBookVO = new EsBookVO();
+        BeanUtils.copyProperties(book, esBookVO, "lastIndexUpdateTime");
+        esBookVO.setLastIndexUpdateTime(new SimpleDateFormat("yyyy/MM/dd HH:mm").format(book.getLastIndexUpdateTime()));
+        Index action = new Index.Builder(esBookVO).index(INDEX).type(TYPE).id(book.getId().toString()).build();
+
+        jestClient.execute(action);
+
+
+    }
+
+    @SneakyThrows
+    @Override
+    public PageInfo searchBook(BookSP params, int page, int pageSize) {
+        List<EsBookVO> bookList = new ArrayList<>(0);
+
+        //使用搜索引擎搜索
+        BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
+        // 构造查询哪个字段
+        if (StringUtils.isNoneBlank(params.getKeyword())) {
+            boolQueryBuilder = boolQueryBuilder.must(QueryBuilders.queryStringQuery(params.getKeyword()));
+        }
+
+        // 作品方向
+        if (params.getWorkDirection() != null) {
+            boolQueryBuilder.filter(QueryBuilders.termQuery("workDirection", params.getWorkDirection()));
+        }
+
+        // 分类
+        if (params.getCatId() != null) {
+            boolQueryBuilder.filter(QueryBuilders.termQuery("catId", params.getCatId()));
+        }
+        if (params.getBookStatus() != null) {
+            boolQueryBuilder.filter(QueryBuilders.termQuery("bookStatus", params.getBookStatus()));
+        }
+
+        if (params.getWordCountMin() == null) {
+            params.setWordCountMin(0);
+        }
+        if (params.getWordCountMax() == null) {
+            params.setWordCountMax(Integer.MAX_VALUE);
+        }
+
+        boolQueryBuilder.filter(QueryBuilders.rangeQuery("wordCount").gte(params.getWordCountMin()).lte(params.getWordCountMax()));
+
+        if (params.getUpdateTimeMin() != null) {
+            boolQueryBuilder.filter(QueryBuilders.rangeQuery("lastIndexUpdateTime").gte(params.getUpdateTimeMin()));
+        }
+
+
+
+        SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+        searchSourceBuilder.query(boolQueryBuilder);
+
+
+        Count count = new Count.Builder().addIndex(INDEX).addType(TYPE)
+                .query(searchSourceBuilder.toString()).build();
+        CountResult results = jestClient.execute(count);
+        Double total = results.getCount();
+
+
+        // 高亮字段
+        HighlightBuilder highlightBuilder = new HighlightBuilder();
+        highlightBuilder.field("authorName");
+        highlightBuilder.field("bookName");
+        highlightBuilder.field("bookDesc");
+        highlightBuilder.field("lastIndexName");
+        highlightBuilder.field("catName");
+        highlightBuilder.preTags("<span style='color:red'>").postTags("</span>");
+        highlightBuilder.fragmentSize(20000);
+        searchSourceBuilder.highlighter(highlightBuilder);
+
+
+        //设置排序
+        if (params.getSort() != null) {
+            searchSourceBuilder.sort(StringUtil.camelName(params.getSort()), SortOrder.DESC);
+        }
+
+        // 设置分页
+        searchSourceBuilder.from((page - 1) * pageSize);
+        searchSourceBuilder.size(pageSize);
+
+        // 构建Search对象
+        Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(INDEX).addType(TYPE).build();
+        log.debug(search.toString());
+        SearchResult result;
+        result = jestClient.execute(search);
+        if (result.isSucceeded()) {
+            log.debug(result.getJsonString());
+
+            Map resultMap = new ObjectMapper().readValue(result.getJsonString(), Map.class);
+            if (resultMap.get("hits") != null) {
+                Map hitsMap = (Map) resultMap.get("hits");
+                if (hitsMap.size() > 0 && hitsMap.get("hits") != null) {
+                    List hitsList = (List) hitsMap.get("hits");
+                    if (hitsList.size() > 0 && result.getSourceAsString() != null) {
+
+                        JavaType jt = new ObjectMapper().getTypeFactory().constructParametricType(ArrayList.class, EsBookVO.class);
+                        bookList = new ObjectMapper().readValue("[" + result.getSourceAsString() + "]", jt);
+
+                        if (bookList != null) {
+                            for (int i = 0; i < bookList.size(); i++) {
+                                hitsMap = (Map) hitsList.get(i);
+                                Map highlightMap = (Map) hitsMap.get("highlight");
+                                if (highlightMap != null && highlightMap.size() > 0) {
+
+                                    List<String> authorNameList = (List<String>) highlightMap.get("authorName");
+                                    if (authorNameList != null && authorNameList.size() > 0) {
+                                        bookList.get(i).setAuthorName(authorNameList.get(0));
+                                    }
+
+                                    List<String> bookNameList = (List<String>) highlightMap.get("bookName");
+                                    if (bookNameList != null && bookNameList.size() > 0) {
+                                        bookList.get(i).setBookName(bookNameList.get(0));
+                                    }
+
+                                    List<String> bookDescList = (List<String>) highlightMap.get("bookDesc");
+                                    if (bookDescList != null && bookDescList.size() > 0) {
+                                        bookList.get(i).setBookDesc(bookDescList.get(0));
+                                    }
+
+                                    List<String> lastIndexNameList = (List<String>) highlightMap.get("lastIndexName");
+                                    if (lastIndexNameList != null && lastIndexNameList.size() > 0) {
+                                        bookList.get(i).setLastIndexName(lastIndexNameList.get(0));
+                                    }
+
+                                    List<String> catNameList = (List<String>) highlightMap.get("catName");
+                                    if (catNameList != null && catNameList.size() > 0) {
+                                        bookList.get(i).setCatName(catNameList.get(0));
+                                    }
+
+
+                                }
+                            }
+
+
+                        }
+                    }
+                }
+            }
+
+            PageInfo<EsBookVO> pageInfo = new PageInfo<>(bookList);
+            pageInfo.setTotal(total.longValue());
+            pageInfo.setPageNum(page);
+            pageInfo.setPageSize(pageSize);
+            return pageInfo;
+        }
+       throw new BusinessException(ResponseStatus.ES_SEARCH_FAIL);
+    }
+}