fix: [DEFECT-1541]租户、租户管理员的启用禁用，已登录的租户或租户管理员在禁用后，需重新登录。不能继续操作其他页面

xp.Huang
1 parent 4c8f4b37
Showing 3 changed files with 71 additions and 12 deletions
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkTenantServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkUserService.java
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
View file @2e6ddb3
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
View file @2e6ddb3
@@ -23,6 +23,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.security.event.UserAuthDataChangedEvent;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
@@ -740,6 +741,31 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     return user;
   }
+  @Override
+  public void updateTenantAdminUserCredentials(
+      List<UserId> ids,
+      String currentTenantId,
+      boolean userCredentialsEnabled,
+      boolean needUpdateStatus) {
+    TenantId tenantId = new TenantId(UUID.fromString(currentTenantId));
+    for (UserId id : ids) {
+      tbUserService.setUserCredentialsEnabled(tenantId, id, userCredentialsEnabled);
+      eventPublisher.publishEvent(new UserAuthDataChangedEvent(id));
+      // 更新租户管理员的状态
+      if (needUpdateStatus) {
+        SysUserEntity entity =
+            baseMapper.selectOne(
+                new LambdaQueryWrapper<SysUserEntity>()
+                    .eq(SysUserEntity::getTenantId, currentTenantId)
+                    .eq(SysUserEntity::getTbUser, id.getId().toString()));
+        if (null != entity) {
+          entity.setEnabled(userCredentialsEnabled);
+          baseMapper.updateById(entity);
+        }
+      }
+    }
+  }
+
   private void checkPassword(AccountReqDTO accountReqDTO, SysUserEntity user) {
     if (null == user
         || StringUtils.isEmpty(accountReqDTO.getPassword())
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkTenantServiceImpl.java
View file @2e6ddb3
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/TkTenantServiceImpl.java
View file @2e6ddb3
@@ -13,10 +13,12 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
+import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.TenantReqDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TenantStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
@@ -60,6 +62,7 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
   private final SysEnterpriseService sysEnterpriseService;
   private final UserRoleMapper userRoleMapper;
   private final TkDeviceProfileService tkDeviceProfileService;
+  private final TkUserService tkUserService;
   @Override
   @Transactional
@@ -276,16 +279,28 @@ public class TkTenantServiceImpl extends AbstractBaseService<TenantMapper, SysTe
         if (!tenantReqDTO.getTenantProfileId().isNullUid()) {
           tenant.setTenantProfileId(tenantReqDTO.getTenantProfileId().getId().toString());
         }
+        String tenantId = tenantReqDTO.getTenantId();
         // update tenant role
         // delete
         Set<String> tenantIds = new HashSet<>();
-        tenantIds.add(tenantReqDTO.getTenantId());
+        tenantIds.add(tenantId);
         freshTenantAdminRole(tenantIds, Arrays.asList(tenantReqDTO.getRoleIds()));
         deleteTenantRolesByTenantId(tenantIds);
         deleteTenantMenusByTenantId(tenantIds);
         // add
-        saveTenantMapping(tenantReqDTO.getTenantId(), tenantReqDTO.getRoleIds());
+        saveTenantMapping(tenantId, tenantReqDTO.getRoleIds());
         baseMapper.updateById(tenant);
+
+        //查询所有的租户管理员，并设置租户管理员的凭证
+        List<UserDTO> list = tkUserService.findAllTenantAdminsByTenantId(tenantId);
+        if(null != list && !list.isEmpty()){
+          List<UserId> tbList = new ArrayList<>();
+          for (UserDTO userDTO: list){
+            UserId userId = new UserId(UUID.fromString(userDTO.getTbUser()));
+            tbList.add(userId);
+          }
+          tkUserService.updateTenantAdminUserCredentials(tbList,tenantId,tenantReqDTO.isEnabled(),true);
+        }
       }
       return tenant.getDTO(TenantDTO.class);
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkUserService.java
View file @2e6ddb3
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkUserService.java
View file @2e6ddb3
 package org.thingsboard.server.dao.yunteng.service;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.query.TsValue;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
@@ -19,7 +20,7 @@ import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 public interface TkUserService {
-  List<UserDetailsDTO> findUserDetailsByUsername(String username,String tenantId);
+  List<UserDetailsDTO> findUserDetailsByUsername(String username, String tenantId);
   UserDTO saveAccount(
       UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isTenantAdmin, String tenantId);
@@ -31,9 +32,8 @@ public interface TkUserService {
   UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles);
   TkPageData<UserDTO> page(
-      Map<String, Object> queryMap,
-      boolean isPtSysadmin,
-      boolean isTenantAdmin);
+      Map<String, Object> queryMap, boolean isPtSysadmin, boolean isTenantAdmin);
+
   TkPageData<UserDTO> tenantPage(Map<String, Object> queryMap, String tenantId);
   UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId);
@@ -42,9 +42,9 @@ public interface TkUserService {
   UserDTO saveTenantAdmin(UserDTO userDTO, boolean isPtSysadmin, String tenantId);
-  void resetPassword(String userId, String tenantId,String password);
+  void resetPassword(String userId, String tenantId, String password);
-  void forgetPassword(String phoneNumber,AccountReqDTO forget);
+  void forgetPassword(String phoneNumber, AccountReqDTO forget);
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
@@ -52,6 +52,7 @@ public interface TkUserService {
   /**
    * 验证租户角色是否有效
+   *
    * @param tenantId
    */
   List<SysTenantRoleEntity> validateTenantRole(String tenantId);
@@ -62,7 +63,7 @@ public interface TkUserService {
    *
    * @param msg 请求信息
    */
-  void sendRestPasswordMsg(String tenantId,SendResetPasswordEmailMsg msg);
+  void sendRestPasswordMsg(String tenantId, SendResetPasswordEmailMsg msg);
   /**
    * 判断账号是否注册过
@@ -74,6 +75,7 @@ public interface TkUserService {
   /**
    * 判断电话是否注册过
+   *
    * @param phoneNumber 手机号
    * @return
    */
@@ -110,6 +112,7 @@ public interface TkUserService {
   /**
    * 修改个人中心
+   *
    * @param userDTO 修改信息
    * @return 修改后的信息
    */
@@ -117,35 +120,50 @@ public interface TkUserService {
   /**
    * 获取当前用户的客户
+   *
    * @param organizationId 组织ID
    * @param tenantId 用户ID
    * @param isTenantAdmin 是否是租户管理员
    * @return 租户创建的所有用户
    */
-  List<UserDTO> getMyCustomers(String organizationId,String tenantId,boolean isTenantAdmin);
+  List<UserDTO> getMyCustomers(String organizationId, String tenantId, boolean isTenantAdmin);
   /**
    * 异步获取用户列表
+   *
    * @param startTs 开始时间
    * @param endTs 结束时间
    * @param ts 时间
    * @return 客户信息
    */
-  CompletableFuture<TsValue> findUsersAsyncByTs(LocalDateTime startTs, LocalDateTime endTs, long ts);
+  CompletableFuture<TsValue> findUsersAsyncByTs(
+      LocalDateTime startTs, LocalDateTime endTs, long ts);
   /**
    * 检查账号是否存在
+   *
    * @param userId 用户ID
    * @param level 级别：0：超级管理员；1：平台管理员；2：租户账号；3：租户下的账号
    * @return true 存在 false 不存在
    */
-  UserDTO checkAccount(String userId,Integer level);
+  UserDTO checkAccount(String userId, Integer level);
   /**
    * 根据租户ID查询所有的租户管理员
+   *
    * @param tenantId 租户ID
    * @return 租户管理员列表
    */
   List<UserDTO> findAllTenantAdminsByTenantId(String tenantId);
+  /**
+   * 更新租户管理员的用户凭证
+   *
+   * @param ids TB用户ID
+   * @param currentTenantId 租户ID
+   * @param userCredentialsEnabled 用户凭证的启用禁用
+   * @param needUpdateStatus 是否需要更新租户管理员的状态
+   */
+  void updateTenantAdminUserCredentials(
+      List<UserId> ids, String currentTenantId, boolean userCredentialsEnabled,boolean needUpdateStatus);
 }