Commit 544ad920 authored by 赵啸非's avatar 赵啸非

添加应用复选字段

parent 19020995
...@@ -433,6 +433,9 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -433,6 +433,9 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
@Override @Override
public Rest<List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context) { public Rest<List<SiteAreaVo>> getAreaSitesBySite(SiteQuery query, Context context) {
List<SiteAreaVo> list = new ArrayList<>(); List<SiteAreaVo> list = new ArrayList<>();
SiteAreaVo siteAreaVo = new SiteAreaVo();
//获取当前节点的第一层子节点 //获取当前节点的第一层子节点
if (ObjectUtils.isEmpty(query.getAreaName())) { if (ObjectUtils.isEmpty(query.getAreaName())) {
throw new AppException("区域名称查询参数不能为空!"); throw new AppException("区域名称查询参数不能为空!");
...@@ -445,12 +448,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -445,12 +448,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
if ("False".equalsIgnoreCase(areaEntity.getHaveSonArea())) { if ("False".equalsIgnoreCase(areaEntity.getHaveSonArea())) {
throw new AppException("当前站点无子区域!"); throw new AppException("当前站点无子区域!");
} }
siteAreaVo.setAreaCode(areaEntity.getAreaCode());
siteAreaVo.setAreaName(areaEntity.getName());
siteAreaVo.setSiteList(Collections.EMPTY_LIST);
list.add(siteAreaVo);
//两层结构{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]} //两层结构{xxx:[{sitename:xxx},{}...],bbb:[{sitename:xxx},{}...]}
AreaQuery areaQuery = new AreaQuery(); AreaQuery areaQuery = new AreaQuery();
areaQuery.setPid(areaEntity.getIid()); areaQuery.setPid(areaEntity.getIid());
List<AreaEntity> childList = areaService.find(areaQuery, context); List<AreaEntity> childList = areaService.find(areaQuery, context);
for (AreaEntity child : childList) { for (AreaEntity child : childList) {
SiteAreaVo siteAreaVo = new SiteAreaVo(); siteAreaVo = new SiteAreaVo();
siteAreaVo.setAreaCode(child.getAreaCode()); siteAreaVo.setAreaCode(child.getAreaCode());
siteAreaVo.setAreaName(child.getName()); siteAreaVo.setAreaName(child.getName());
......
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