|
@@ -1,19 +1,10 @@
|
|
|
package com.bizmatics.service.es.impl;
|
|
|
|
|
|
import com.bizmatics.model.Device;
|
|
|
-import com.bizmatics.model.UserSite;
|
|
|
import com.bizmatics.model.es.RtAnalog;
|
|
|
import com.bizmatics.persistence.mapper.DeviceMapper;
|
|
|
import com.bizmatics.persistence.mapper.es.ElasticRepository;
|
|
|
-import com.bizmatics.service.RtAnalogDataService;
|
|
|
import com.bizmatics.service.es.RtAnalogService;
|
|
|
-import org.elasticsearch.index.query.BoolQueryBuilder;
|
|
|
-import org.elasticsearch.index.query.MatchQueryBuilder;
|
|
|
-import org.elasticsearch.index.query.QueryBuilders;
|
|
|
-import org.elasticsearch.search.builder.SearchSourceBuilder;
|
|
|
-import org.elasticsearch.search.sort.FieldSortBuilder;
|
|
|
-import org.elasticsearch.search.sort.SortBuilders;
|
|
|
-import org.elasticsearch.search.sort.SortOrder;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Page;
|
|
|
import org.springframework.data.domain.PageRequest;
|
|
@@ -28,7 +19,8 @@ import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
-import static org.elasticsearch.index.query.QueryBuilders.*;
|
|
|
+import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
|
|
|
+import static org.elasticsearch.index.query.QueryBuilders.termsQuery;
|
|
|
|
|
|
/**
|
|
|
* @author yq
|