windy/msgexchange-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加滚动搜索功能

Browse Source
This commit is contained in:
zhouxiunai
2019-04-29 18:07:49 +08:00
parent 1c31f623e5
commit dc9d41623c
3 changed files with 188 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/msgexchangeapi/controller/FlightsController.java
+95
View File
@@ -1,15 +1,28 @@
package com.gzzn.omms.msgexchangeapi.controller;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.elasticsearch.index.query.MatchAllQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.gzzn.omms.msgexchangeapi.dto.ResponseDto;
import com.gzzn.omms.msgexchangeapi.elasticsearch.ElasticsearchUtil;
import com.gzzn.omms.msgexchangeapi.entity.msg.ABNDATA;
import com.gzzn.omms.msgexchangeapi.entity.msg.DIVERSIONDATA;
import com.gzzn.omms.msgexchangeapi.entity.msg.OPTDELAYDATA;
import com.gzzn.omms.msgexchangeapi.entity.msg.RETURNDATA;
import com.gzzn.omms.msgexchangeapi.entity.msg.SCHD;
import com.gzzn.omms.msgexchangeapi.service.flightInfo.IFlightInfoService;
import com.gzzn.omms.msgexchangeapi.utils.JsonUtil;
@RestController
public class FlightsController {
@@ -32,4 +45,86 @@ public class FlightsController {
return ResponseDto.success(fltrsRt);
}
/**
* 迁移航班历史信息
* @return
*/
@GetMapping("/flights/migrate")
public ResponseDto migrateFlightHst()
{
//get old fltrs
MatchAllQueryBuilder matchAllQueryBuilder = QueryBuilders.matchAllQuery();
List<Map<String, Object>> listInEs = ElasticsearchUtil
.searchListDataWithScoll(
"flight_hts",
"_doc",
matchAllQueryBuilder,
null,
null,
null);
//trans to new fltrs
List<SCHD.FLTR> lsFltrs = transToNewFltrs(listInEs);
//fltrs save to new index
for (SCHD.FLTR fltr : lsFltrs) {
JSONObject jsondata = JSONObject.parseObject(JsonUtil.getString(fltr));
ElasticsearchUtil.addData(jsondata, "flight_hts2", "_doc");
}
return ResponseDto.success();
}//end function
private List<SCHD.FLTR> transToNewFltrs(List<Map<String, Object>> listInEs)
{
List<SCHD.FLTR> lsFltrs = new ArrayList<SCHD.FLTR>();
for (Map<String, Object> map : listInEs) {
ObjectMapper objMappper = new ObjectMapper();
SCHD.FLTR fltr = objMappper.convertValue(map, SCHD.FLTR.class);
//add BODY to Spec key
for (int i=0;i < fltr.getAbn().size();i++) {
ABNDATA abn = fltr.getAbn().get(i);
List<Map<String, Object>> lsAbn = (List<Map<String, Object>>)map.get("ABN");
Map abnMap = lsAbn.get(i);
switch (abn.getType()) {
case DLY:
abn.setDly(mapToDly((List<Map<String, Object>>) abnMap.get("BODY")));
break;
case CAN:
abn.setCan(objMappper.convertValue(abnMap.get("BODY"), String.class));
break;
case RTN:
abn.setRtn(objMappper.convertValue(abnMap.get("BODY"), RETURNDATA.class));
break;
case ALT:
abn.setAlt(objMappper.convertValue(abnMap.get("BODY"), DIVERSIONDATA .class));
break;
}
} //end for
lsFltrs.add(fltr);
}//end for
return lsFltrs;
}//end function
private List<OPTDELAYDATA> mapToDly(List<Map<String,Object>> ls)
{
List<OPTDELAYDATA> rtLs = new ArrayList<>(ls.size());
for(Map<String, Object> map : ls)
{
ObjectMapper objMappper = new ObjectMapper();
OPTDELAYDATA optdelaydata = objMappper.convertValue(map, OPTDELAYDATA.class);
rtLs.add(optdelaydata);
}
return rtLs;
}
}
src/main/java/com/gzzn/omms/msgexchangeapi/elasticsearch/ElasticsearchUtil.java
+77 -1
View File
@@ -20,6 +20,7 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.transport.TransportClient;
import org.elasticsearch.common.text.Text;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
@@ -125,7 +126,8 @@ public class ElasticsearchUtil {
LOGGER.info("addData response status:{},id:{}", response.status().getStatus(), response.getId());
return response.getId();
}
/**
* 数据添加
*
@@ -260,8 +262,82 @@ public class ElasticsearchUtil {
return null;
}
/**
* 使用分词查询
*
* @param index 索引名称
* @param type 类型名称,可传入多个type逗号分隔
* @param query 查询条件
* @param fields 需要显示的字段，逗号分隔（缺省为全部字段）
* @param sortField 排序字段
* @param sortOrder
* @param highlightField 高亮字段
* @return
*/
public static List<Map<String, Object>> searchListDataWithScoll(
String index, String type, QueryBuilder query,
String fields, String sortField, SortOrder sortOrder) {
SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index);
if (!StringUtils.isEmpty(type)) {
searchRequestBuilder.setTypes(type.split(","));
}
if (!StringUtils.isEmpty(fields)) {
searchRequestBuilder.setFetchSource(fields.split(","), null);
}
if(null==sortOrder){
sortOrder = SortOrder.DESC;
}
if (!StringUtils.isEmpty(sortField)) {
searchRequestBuilder.addSort(sortField, sortOrder);
}
int size = 1000;
searchRequestBuilder.setQuery(query);
searchRequestBuilder.setFetchSource(true);
searchRequestBuilder.setSize(size).setScroll(new TimeValue(2000));
//打印的内容 可以在 Elasticsearch head 和 Kibana 上执行查询
LOGGER.info("\n{}", searchRequestBuilder);
List<Map<String, Object>> sourceList = new ArrayList<Map<String, Object>>();
SearchResponse searchResponse = searchRequestBuilder.execute().actionGet();
sourceList.addAll(getSearchResponse(searchResponse));
//根据total 滚动搜索
long page = searchResponse.getHits().getTotalHits() / size;
for (int i = 0; i < page; i++) {
//再次发送请求,并使用上次搜索结果的ScrollId
searchResponse = client.prepareSearchScroll(searchResponse.getScrollId())
.setScroll(new TimeValue(20000)).execute()
.actionGet();
sourceList.addAll(getSearchResponse(searchResponse));
}
return sourceList;
}
private static List<Map<String, Object>> getSearchResponse(SearchResponse searchResponse)
{
List<Map<String, Object>> sourceList = new ArrayList<Map<String, Object>>();
for (SearchHit searchHit : searchResponse.getHits().getHits()) {
searchHit.getSourceAsMap().put("id", searchHit.getId());
sourceList.add(searchHit.getSourceAsMap());
}
return sourceList;
}
/**
* 高亮结果集 特殊处理
*
src/test/java/com/gzzn/omms/msgexchangeapi/controller/FlightsControllerTest.java
+16
View File
@@ -36,4 +36,20 @@ public class FlightsControllerTest {
.andExpect(jsonPath("$.is_success").value(true))
.andDo(print());
}
/**
* 测试获取所有航班信息接口
* @throws Exception
*/
@Test
public void testMigrateFilghts() throws Exception
{
mvc.
perform(get("/flights/migrate"))
.andExpect(status().isOk())
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$.is_success").value(true))
.andDo(print());
}
}