|
|
@@ -10,6 +10,7 @@ import lombok.Getter;
|
|
|
import lombok.SneakyThrows;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.elasticsearch.search.aggregations.bucket.filter.Filter;
|
|
|
+import org.hswebframework.ezorm.core.param.Term;
|
|
|
import org.hswebframework.ezorm.rdb.mapping.ReactiveRepository;
|
|
|
import org.hswebframework.ezorm.rdb.mapping.defaults.SaveResult;
|
|
|
import org.hswebframework.reactor.excel.ReactorExcel;
|
|
|
@@ -875,6 +876,11 @@ public class DeviceInstanceController implements
|
|
|
// * 没有查询区域
|
|
|
// */
|
|
|
param.getQuery().setIncludes(CollectionUtil.newHashSet("id","name","location","productId","productName"));
|
|
|
+ Term term = new Term();
|
|
|
+ term.setColumn("location");
|
|
|
+ term.setType(Term.Type.and);
|
|
|
+ term.setTermType("notnull");
|
|
|
+ param.getQuery().addTerm(term);
|
|
|
return instanceService.queryPager(param.getQuery())
|
|
|
.doOnNext(result->result.getData().forEach(DeviceInstanceEntity::toGeoJson)
|
|
|
).map(result->
|
