添加根据部门id 查询所属大厅

base-manager/src/main/java/com/mortals/xhx/common/utils/SyncTreeSiteThread.java

@@ -28,7 +28,7 @@ public class SyncTreeSiteThread implements Runnable {
         SiteService siteService = SpringUtils.getBean(SiteService.class);
         List<SiteTreeSelect> siteTreeSelects = siteService.siteTree(context);
         siteService.setSiteTree(siteTreeSelects, context);
-       // log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));
+        log.info("刷新用户站点树=》userID:{} siteIds:{} siteTree:{}",context.getUser().getId(),context.getUser().getSiteIds(), JSON.toJSONString(siteService.getSiteTree(context)));
     }
 
 }

base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java

@@ -56,33 +56,6 @@ public class DemoStartedService implements IApplicationStartedService {
         ThreadPool.getInstance().execute(syncTreeSiteThread);
 
 
-/*        userService.find(new UserQuery()).forEach(user->{
-            Context context = new Context();
-            context.setUser(user);
-            ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
-        });*/
-
-/*        if(ObjectUtils.isEmpty(userFeign)){
-            logger.info("userFeign未加载,加载本地用户");
-            userService.find(new UserQuery()).forEach(user->{
-                Context context = new Context();
-                context.setUser(user);
-                ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
-            });
-
-            return;
-        }*/
-
-/*        userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
-            Context context = new Context();
-
-            UserEntity entity = new UserEntity();
-            entity.initAttrValue();
-            BeanUtils.copyProperties(userPdu, entity, BeanUtil.getNullPropertyNames(userPdu));
-
-            context.setUser(entity);
-            ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
-        });*/
     }
 
     @Override

base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java

@@ -242,7 +242,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
                 recursionFn(areaMap, areaEntity);
             }
         }
-        //log.info("rebuildAreaMap==>{}", JSON.toJSONString(areaMap));
+        log.info("rebuildAreaMap==>{}", JSON.toJSONString(areaMap));
         //areaMap 为当前站点相关区域树结构 已经剔除不必要的分支结构
         return buildSiteTreeSelect(areaMap, siteMap);
     }

base-manager/src/test/java/com/mortals/httpclient/site/SiteController.http

@@ -65,7 +65,7 @@ Accept: application/json
 ###构建站点树
 GET {{baseUrl}}/site/siteTree
 #Authorization: {{authToken}}
-Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjM1OmVjZTkyMWQ1MzY2NDRkMmRhZTU0YmU0ZjA4ODE0OWZkIn0.EXKwA8I8t5rK864aJqMEh51XZ8IPtjG3juV51mgJf80
+Authorization: eyJhbGciOiJIUzI1NiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE6NTgyNzRlMWM1MDlhNDQ2YzhmYjVlMDRkNjNlM2JmOTAifQ.dLq6-GLVOPvxq66pbqpj0K5qx1y3FzbKzbKq-wCxOr4
 Accept: application/json
 
 

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -5,7 +5,7 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"admin",
+  "password":"xhx@yb888",
   "securityCode":"8888"
 }