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

添加初始化数据库脚本

parent 2ee2803c
...@@ -89,8 +89,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -89,8 +89,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
SiteQuery siteQuery = new SiteQuery(); SiteQuery siteQuery = new SiteQuery();
Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet()); Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet());
log.info("initSiteIds==>{}", JSON.toJSONString(siteSet));
if (!ObjectUtils.isEmpty(siteSet)) { if (!ObjectUtils.isEmpty(siteSet)) {
List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList()); List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(siteIdList)) { if (!ObjectUtils.isEmpty(siteIdList)) {
...@@ -102,6 +100,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -102,6 +100,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
List<SiteEntity> siteList = this.find(siteQuery); List<SiteEntity> siteList = this.find(siteQuery);
//如果是管理员 默认全部站点 //如果是管理员 默认全部站点
if(context.getUser().isAdmin()){ if(context.getUser().isAdmin()){
log.info("user is admin !");
siteList = this.find(new SiteQuery()); siteList = this.find(new SiteQuery());
} }
...@@ -119,7 +118,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -119,7 +118,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
recursionFn(areaMap, areaEntity); recursionFn(areaMap, areaEntity);
} }
} }
log.info("rebuildAreaMap==>{}", JSON.toJSONString(areaMap)); //log.info("rebuildAreaMap==>{}", JSON.toJSONString(areaMap));
//areaMap 为当前站点相关区域树结构 已经剔除不必要的分支结构 //areaMap 为当前站点相关区域树结构 已经剔除不必要的分支结构
return buildSiteTreeSelect(areaMap, siteMap); return buildSiteTreeSelect(areaMap, siteMap);
} }
......
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