WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文档库--搜索(全部)

Browse Source
This commit is contained in:
zhn
2022-03-18 16:40:38 +08:00
parent 9f98d9704d
commit c9a2691468
8 changed files with 380 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/es/JeroElasticsearchTemplate.java
+21 -4
View File
@@ -2,10 +2,10 @@ package com.jero.common.es;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import com.jero.common.util.RestUtil;
import com.jero.common.util.oConvertUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -13,7 +13,11 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 关于 ElasticSearch 的一些方法（创建索引、添加数据、查询等）
@@ -418,11 +422,24 @@ public class JeroElasticsearchTemplate {
* @param size 返回条目数
* @return { "query": query }
*/
public JSONObject buildQuery(List<String> _source, JSONObject query,String sort, int from, int size) {
// public JSONObject buildQuery(List<String> _source, JSONObject query,List<Map<String, Object>> highlight,String sort, int from, int size) {
// JSONObject json = new JSONObject();
// if (_source != null) {
// json.put("_source", _source);
// }
// json.put("highlight", highlight);
// json.put("query", query);
// json.put("from", from);
// json.put("size", size);
//// json.put("sort", sort);
// return json;
// }
public JSONObject buildQuery(List<String> _source, JSONObject query,Map<String, Object> highlight,String sort, int from, int size) {
JSONObject json = new JSONObject();
if (_source != null) {
json.put("_source", _source);
}
json.put("highlight", highlight);
json.put("query", query);
json.put("from", from);
json.put("size", size);
jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/config/CommonConfig.java → jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/esconfig/CommonConfig.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.jero.common.config;
package com.jero.common.esconfig;
import com.jero.common.util.SpringContextHolder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;