Commit ec23f567 authored by 赵啸非's avatar 赵啸非

添加用户查询列表

parent 4ad6162c
...@@ -43,6 +43,15 @@ public class SiteTreeSelect implements Serializable { ...@@ -43,6 +43,15 @@ public class SiteTreeSelect implements Serializable {
*/ */
private Boolean isLeaf; private Boolean isLeaf;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
/** /**
* 节点类型 * 节点类型
*/ */
...@@ -84,6 +93,8 @@ public class SiteTreeSelect implements Serializable { ...@@ -84,6 +93,8 @@ public class SiteTreeSelect implements Serializable {
this.siteCode = collect.stream().map(item -> item.getSiteCode()).collect(Collectors.joining(",")); this.siteCode = collect.stream().map(item -> item.getSiteCode()).collect(Collectors.joining(","));
this.type = "site"; this.type = "site";
this.icon = "el-icon-document"; this.icon = "el-icon-document";
this.longitude = collect.stream().findFirst().map(item -> item.getLongitude()).orElseGet(() -> "");
this.latitude = collect.stream().findFirst().map(item -> item.getLatitude()).orElseGet(() -> "");
} else { } else {
this.id = entity.getIid(); this.id = entity.getIid();
this.label = entity.getName(); this.label = entity.getName();
...@@ -109,6 +120,9 @@ public class SiteTreeSelect implements Serializable { ...@@ -109,6 +120,9 @@ public class SiteTreeSelect implements Serializable {
this.type = "site"; this.type = "site";
this.icon = "el-icon-document"; this.icon = "el-icon-document";
this.longitude = entity.getLongitude();
this.latitude = entity.getLatitude();
} }
} }
\ No newline at end of file
...@@ -213,7 +213,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -213,7 +213,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
for (SiteEntity siteEntity : siteEntities) { for (SiteEntity siteEntity : siteEntities) {
boolean bool = getSite(areaCode, siteEntity.getAreaCode(), siteList, siteEntity); boolean bool = getSite(areaCode, siteEntity.getAreaCode(), siteList, siteEntity);
if (bool) continue; if (bool) continue;
} }
return siteList; return siteList;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment