添加资源自动刷新获取

base-manager/src/main/java/com/mortals/xhx/base/system/user/service/impl/UserServiceImpl.java

@@ -75,6 +75,8 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
     @Autowired
     private RoleUserService roleUserService;
+    @Autowired
+    private SiteService siteService;
 
     @Lazy
     @Autowired
@@ -322,7 +324,6 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
 
         List<UserEntity> existUsers = list.parallelStream().map(item -> this.getExtCache(item.getLoginName())).filter(f -> f != null).collect(Collectors.toList());
 
-
         Map<String, UserEntity> existUserMap = existUsers.parallelStream().collect(Collectors.toMap(x -> x.getLoginName(), y -> y, (o, n) -> n));
         //分组查找存在的与不存在的用户
         Map<Boolean, List<UserPdu>> collect = list.parallelStream().collect(Collectors.partitioningBy(x -> existUserMap.containsKey(x.getLoginName())));
@@ -346,7 +347,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
             UserEntity userEntity = new UserEntity();
             BeanUtils.copyProperties(user, userEntity, new String[]{"loginPwd", "loginName", "userType", "status", "lastLoginTime", "lastLoginAddress"});
             userEntity.setId(existUserMap.get(user.getLoginName()).getId());
-            this.updateWidthDao(userEntity);
+            // this.updateWidthDao(userEntity);
             if (!ObjectUtils.isEmpty(userEntity.getSiteIds())) {
                 userEntitySave.add(userEntity);
             }
@@ -364,7 +365,9 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
             }
         });
 
-        //单独更新全站点
+        siteService.updateAllSiteTree(null);
+
+    /*    //单独更新全站点
         UserEntity userEntity = new UserEntity();
         userEntity.initAttrValue();
         userEntity.setId(0L);
@@ -380,7 +383,7 @@ public class UserServiceImpl extends AbstractCRUDCacheServiceImpl<UserDao, UserE
         contextTemp.setUser(userEntity);
         syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
         ThreadPool.getInstance().execute(syncTreeSiteThread);
-
+*/
 
     }
 

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

@@ -40,6 +40,8 @@ public class DemoStartedService implements IApplicationStartedService {
     private UserService userService;
     @Autowired
     private ICacheService cacheService;
+    @Autowired
+    private SiteService siteService;
 
     @Override
     public void start() {
@@ -48,7 +50,9 @@ public class DemoStartedService implements IApplicationStartedService {
         //删除redis 中的 站点树
         cacheService.del(USER_SITE_TREE);
 
-        UserEntity userEntity = new UserEntity();
+        siteService.updateAllSiteTree(null);
+
+     /*   UserEntity userEntity = new UserEntity();
         userEntity.initAttrValue();
         userEntity.setId(0L);
         Context contextTemp = new Context();
@@ -62,8 +66,7 @@ public class DemoStartedService implements IApplicationStartedService {
          contextTemp = new Context();
         contextTemp.setUser(userEntity);
          syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
-        ThreadPool.getInstance().execute(syncTreeSiteThread);
-
+        ThreadPool.getInstance().execute(syncTreeSiteThread);*/
 
     }
 

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

@@ -67,4 +67,6 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
     Rest<String> syncMatterBySiteId(SiteEntity siteEntity, Context context);
 
     void deleteBysiteIdAndSource(Long siteId, Integer source, Context context);
+
+    void updateAllSiteTree(Context context);
 }
\ No newline at end of file

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

@@ -16,6 +16,8 @@ import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
 import com.mortals.framework.util.DataUtil;
 import com.mortals.framework.util.HttpUtil;
 import com.mortals.framework.util.StringUtils;
+import com.mortals.framework.util.ThreadPool;
+import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.AreaLevelDxTypeEnum;
 import com.mortals.xhx.common.code.AreaLevelEnum;
@@ -25,6 +27,7 @@ import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.device.DevicePdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.common.utils.MatterHtmlParseUtil;
+import com.mortals.xhx.common.utils.SyncTreeSiteThread;
 import com.mortals.xhx.feign.device.IDeviceFeign;
 import com.mortals.xhx.feign.user.IUserFeign;
 import com.mortals.xhx.module.area.model.AreaEntity;
@@ -191,14 +194,19 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         super.saveAfter(entity, context);
         //刷新站点树
         //ThreadPool.getInstance().execute(new SyncTreeSiteThread(this,context));
-        Rest<String> rest = userFeign.synchSiteAuth();
+/*        Rest<String> rest = userFeign.synchSiteAuth();
         if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
             UserPdu userPdu = new UserPdu();
             userPdu.setPage(1);
             userPdu.setSize(-1);
             Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
             userService.updateUserList(list.getData().getData());
-        }
+        }*/
+
+        this.updateAllSiteTree(context);
+
+        //新加的站点 只需要更新全树
+
         //更新同步部门相关
         deptService.syncDeptBySiteId(entity, context);
 
@@ -239,7 +247,7 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
                 }
             }
             //查詢指定的站點ids
-           // log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
+            // log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
             siteList = this.find(siteQuery);
         }
         //如果是管理员 默认全部站点
@@ -340,16 +348,16 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
 
     @Override
     protected void updateAfter(SiteEntity entity, Context context) throws AppException {
-        super.updateAfter(entity,context);
+        super.updateAfter(entity, context);
         //刷新站点树
-        Rest<String> rest = userFeign.synchSiteAuth();
+/*        Rest<String> rest = userFeign.synchSiteAuth();
         if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
             UserPdu userPdu = new UserPdu();
             userPdu.setPage(1);
             userPdu.setSize(-1);
             Rest<RespData<List<UserPdu>>> list = userFeign.list(userPdu);
             userService.updateUserList(list.getData().getData());
-        }
+        }*/
         if (refresh) {
             //通知设备更新站点信息
             DevicePdu devicePdu = new DevicePdu();
@@ -815,6 +823,28 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
         this.dao.delete(condition);
     }
 
+    /**
+     * @param context
+     */
+    @Override
+    public void updateAllSiteTree(Context context) {
+        UserEntity userEntity = new UserEntity();
+        userEntity.initAttrValue();
+        userEntity.setId(0L);
+        Context contextTemp = new Context();
+        contextTemp.setUser(userEntity);
+        SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
+        ThreadPool.getInstance().execute(syncTreeSiteThread);
+
+        userEntity = new UserEntity();
+        userEntity.initAttrValue();
+        userEntity.setId(1L);
+        contextTemp = new Context();
+        contextTemp.setUser(userEntity);
+        syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
+        ThreadPool.getInstance().execute(syncTreeSiteThread);
+    }
+
 
     public List<MatterEntity> subList(List<MatterEntity> firstList, List<MatterEntity> secondList) {
         Set<String> secondSet = secondList.parallelStream().map(e -> e.getMatterNo()).collect(Collectors.toSet());