fix: [DEFECT-799] ptAdmin allow manager tenant

黄 x
1 parent 03235e57
Showing 7 changed files with 188 additions and 107 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkRoleController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantProfilesController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkUserService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
View file @3478cd7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkAdminController.java
View file @3478cd7
@@ -53,14 +53,15 @@ public class TkAdminController extends BaseController {
   private final TkTenantService tkTenantService;
   private final MenuService menuService;
-  private final TkUserService userService;
+  private final TkUserService tkUserService;
   private final TenantService tenantService;
   private final InstallScripts installScripts;
   private final UserService tbUserService;
   @PostMapping("/tenant")
   @Deprecated
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:post'})")
   public ResponseEntity<TenantDTO> saveTenant(@RequestBody TenantReqDTO tenantReqDTO) {
     TenantDTO newTenant = tkTenantService.createNewTenant(tenantReqDTO);
     URI location =
@@ -92,7 +93,8 @@ public class TkAdminController extends BaseController {
   }
   @PutMapping("/tenant")
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:update'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:update'})")
   public TenantDTO updateTenant(@RequestBody TenantDTO tenantDTO) {
     Assert.notNull(tenantDTO, "tenant cannot be null");
     Assert.notNull(tenantDTO.getId(), "tenant id cannot be null when update");
@@ -106,7 +108,8 @@ public class TkAdminController extends BaseController {
   }
   @DeleteMapping("/tenant")
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:delete'})")
   public void deleteTenant(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
@@ -130,20 +133,20 @@ public class TkAdminController extends BaseController {
   }
   @DeleteMapping("/user/deleteTenantAdmin")
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:user:deleteTenantAdmin:delete'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:user:deleteTenantAdmin:delete'})")
   public ResponseEntity<Boolean> deleteTenantAdmin(
       @Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     for (String strUserId : deleteDTO.getIds()) {
-      UserDTO userDTO = userService.findUserInfoById(strUserId);
+      UserDTO userDTO = tkUserService.findUserInfoById(strUserId);
       if (null != userDTO && StringUtils.isNotBlank(userDTO.getTbUser())) {
-        deleteTenantAdmin(userDTO.getTbUser());
+        deleteTenantAdmin(userDTO.getTbUser(), getCurrentUser().isPtAdmin());
       }
     }
+    boolean allowDelete = getCurrentUser().isPtSysadmin() || getCurrentUser().isPtAdmin();
     boolean result =
-        userService.deleteUser(
-            deleteDTO.getIds(),
-            getCurrentUser().isPtSysadmin(),
-            getCurrentUser().getCurrentTenantId());
+        tkUserService.deleteUser(
+            deleteDTO.getIds(), allowDelete, getCurrentUser().getCurrentTenantId());
     return ResponseEntity.ok(result);
   }
@@ -153,7 +156,8 @@ public class TkAdminController extends BaseController {
   }
   @PostMapping("/tenant/adminUser")
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:admin:tenant:adminUser:post'})")
   public ResponseEntity<UserDTO> createTenantAdmin(
       @RequestParam(value = "sendEmail", required = false, defaultValue = "false")
           boolean sendEmail,
@@ -161,14 +165,14 @@ public class TkAdminController extends BaseController {
       @RequestBody UserDTO userDTO)
       throws ThingsboardException {
     UserDTO newUserDTO =
-        userService.saveAccount(
+        tkUserService.saveAccount(
             userDTO,
             sendEmail,
             sendMsg,
             getCurrentUser().isPtSysadmin(),
             getCurrentUser().getCurrentTenantId());
     Optional<UserDTO> optional =
-        userService.getUser(
+        tkUserService.getUser(
             newUserDTO.getId(),
             getCurrentUser().isPtSysadmin(),
             getCurrentUser().getCurrentTenantId());
@@ -190,7 +194,8 @@ public class TkAdminController extends BaseController {
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentUserId(),
             getCurrentUser().isPtSysadmin(),
-            getCurrentUser().isPtTenantAdmin(),needButton));
+            getCurrentUser().isPtTenantAdmin(),
+            needButton));
   }
   @PutMapping("/menu/assign/{tenantId}")
@@ -208,10 +213,15 @@ public class TkAdminController extends BaseController {
     return tkTenantService.updateOrCreateTenant(tenantReqDTO);
   }
-  private void deleteTenantAdmin(String strUserId) throws ThingsboardException {
+  private void deleteTenantAdmin(String strUserId, boolean isPtAdmin) throws ThingsboardException {
     try {
       UserId currentUserId = new UserId(toUUID(strUserId));
-      User user = checkUserId(currentUserId, Operation.DELETE);
+      User user;
+      if (isPtAdmin) {
+        user = userService.findUserById(getCurrentUser().getTenantId(), currentUserId);
+      } else {
+        user = checkUserId(currentUserId, Operation.DELETE);
+      }
       List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(getTenantId(), currentUserId);
       tbUserService.deleteUser(getTenantId(), currentUserId);
       logEntityAction(
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRoleController.java
View file @3478cd7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkRoleController.java
View file @3478cd7
@@ -29,7 +29,7 @@ public class TkRoleController extends BaseController {
   private final RoleService roleService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN','TENANT_ADMIN')")
   public YtPageData<RoleDTO> pageRole(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
@@ -46,13 +46,16 @@ public class TkRoleController extends BaseController {
     if (status != null) {
       queryMap.put("status", status == 1);
     }
+    if (getCurrentUser().isPtAdmin()){
+      roleType = RoleEnum.TENANT_ADMIN;
+    }
     if(roleType !=null){
       queryMap.put("roleType", roleType.name());
     }
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
-    return roleService.page(getCurrentUser().getCurrentTenantId(),queryMap);
+    return roleService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
   @DeleteMapping
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantController.java
View file @3478cd7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantController.java
View file @3478cd7
@@ -37,7 +37,7 @@ public class TkTenantController extends AbstractUserAccount {
   }
   @PostMapping("/reset_password/{userId}")
-  @PreAuthorize("hasAnyAuthority('SYS_ADMIN')")
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
   public void resetPassword(@PathVariable("userId") String userId) throws ThingsboardException {
     //check is tenant account
     UserDTO userDTO = userService.checkAccount(userId,2);
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantProfilesController.java
View file @3478cd7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkTenantProfilesController.java
View file @3478cd7
@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -16,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import java.util.List;
+import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -24,7 +26,7 @@ import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.
 @RequiredArgsConstructor
 public class TkTenantProfilesController extends BaseController {
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN'},{})")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{})")
   @GetMapping(
       name = "page",
       params = {PAGE_SIZE, PAGE})
@@ -44,8 +46,12 @@ public class TkTenantProfilesController extends BaseController {
               textSearch,
               orderBy,
               null == orderType ? OrderTypeEnum.DESC.name() : orderType.name());
+      TenantId tenantId = getTenantId();
+      if(getCurrentUser().isPtAdmin()){
+        tenantId = new TenantId(UUID.fromString(getCurrentUser().getCurrentTenantId()));
+      }
       PageData<TenantProfile> tenantProfilePageData =
-          tenantProfileService.findTenantProfiles(getTenantId(), pageLink);
+          tenantProfileService.findTenantProfiles(tenantId, pageLink);
       List<TenantProfile> targetList =
           ReflectUtils.sourceToTarget(tenantProfilePageData.getData(), TenantProfile.class);
       return new YtPageData<>(targetList, tenantProfilePageData.getTotalElements());
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
View file @3478cd7
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
View file @3478cd7
@@ -61,15 +61,19 @@ public class TkUserController extends AbstractUserAccount {
   private final TkUserService userService;
   private final AccountProperties accountProperties;
-  public TkUserController(UserService tbUserService, ApplicationEventPublisher eventPublisher,
-                          SystemSecurityService systemSecurityService,
-                          BCryptPasswordEncoder passwordEncoder,
-                          TkUserService userService,
-                          AccountProperties accountProperties) {
-    super(tbUserService,eventPublisher,systemSecurityService,passwordEncoder);
+
+  public TkUserController(
+      UserService tbUserService,
+      ApplicationEventPublisher eventPublisher,
+      SystemSecurityService systemSecurityService,
+      BCryptPasswordEncoder passwordEncoder,
+      TkUserService userService,
+      AccountProperties accountProperties) {
+    super(tbUserService, eventPublisher, systemSecurityService, passwordEncoder);
     this.userService = userService;
     this.accountProperties = accountProperties;
   }
+
   @GetMapping("{userId}")
   @PreAuthorize("@check.checkPermissions({},{'api:yt:user:get'})")
   public ResponseEntity<UserDTO> getUser(@PathVariable("userId") String userId)
@@ -93,11 +97,10 @@ public class TkUserController extends AbstractUserAccount {
   @GetMapping(
       path = "page",
       params = {PAGE_SIZE, PAGE})
+  @ApiOperation(value = "获取用户分页数据")
   public YtPageData<UserDTO> pageUser(
       @RequestParam(PAGE_SIZE) int pageSize,
       @RequestParam(PAGE) int page,
-      @RequestParam(value = "realName", required = false) String realName,
-      @RequestParam(value = "username", required = false) String username,
       @RequestParam(value = "tenantId", required = false) String tenantId,
       @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = "roleType", required = false) RoleEnum roleType,
@@ -108,8 +111,6 @@ public class TkUserController extends AbstractUserAccount {
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
-    queryMap.put("realName", realName);
-    queryMap.put("username", username);
     if (null != roleType && roleType.equals(RoleEnum.TENANT_ADMIN)) {
       queryMap.put("roleType", roleType.name());
     } else {
@@ -127,6 +128,31 @@ public class TkUserController extends AbstractUserAccount {
         queryMap, getCurrentUser().isPtSysadmin(), getCurrentUser().isTenantAdmin());
   }
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
+  @GetMapping(
+      path = "/tenant/page",
+      params = {PAGE_SIZE, PAGE})
+  @ApiOperation(value = "获取租户管理员分页数据")
+  public YtPageData<UserDTO> tenantPage(
+      @RequestParam(PAGE_SIZE) int pageSize,
+      @RequestParam(PAGE) int page,
+      @RequestParam(value = ORDER_FILED, required = false) String orderBy,
+      @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType,
+      @RequestParam(TENANT_ID) String tenantId)
+      throws ThingsboardException {
+    HashMap<String, Object> queryMap = new HashMap<>();
+    queryMap.put(PAGE_SIZE, pageSize);
+    queryMap.put(PAGE, page);
+    if (orderType != null) {
+      queryMap.put(ORDER_TYPE, orderType.name());
+    }
+    queryMap.put(ORDER_FILED, orderBy);
+    if (StringUtils.isEmpty(tenantId)) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return userService.tenantPage(queryMap, tenantId);
+  }
+
   @PutMapping
   @ApiOperation(value = "修改用户信息")
   @PreAuthorize("@check.checkPermissions({},{'api:yt:user:update'})")
@@ -138,12 +164,13 @@ public class TkUserController extends AbstractUserAccount {
   @PutMapping("/center")
   @ApiOperation(value = "修改个人中心")
-  public UserInfoDTO updatePersonalCenter(@Validated(UpdateGroup.class) @RequestBody UserDTO userDTO) throws ThingsboardException {
+  public UserInfoDTO updatePersonalCenter(
+      @Validated(UpdateGroup.class) @RequestBody UserDTO userDTO) throws ThingsboardException {
     userService.updatePersonalCenter(userDTO);
     return userService.me(
-            getCurrentUser().getCurrentUserId(),
-            getCurrentUser().getCurrentTenantId(),
-            getCurrentUser().getRoles());
+        getCurrentUser().getCurrentUserId(),
+        getCurrentUser().getCurrentTenantId(),
+        getCurrentUser().getRoles());
   }
   @PostMapping
@@ -156,7 +183,7 @@ public class TkUserController extends AbstractUserAccount {
       @Validated({AddGroup.class}) @RequestBody UserDTO userDTO)
       throws ThingsboardException {
-    //检查用户手机号、邮箱
+    // 检查用户手机号、邮箱
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     // 如果当前用户是租户管理员，则代表创建的用户为CUSTOMER_USER,则需要调用TB,否则为本平台的管理员不需要调用TB
     boolean isTenantAdminOperator = getCurrentUser().isPtTenantAdmin();
@@ -169,7 +196,7 @@ public class TkUserController extends AbstractUserAccount {
           createTBUser(
               tbUser, userDTO, customer.getTenantId(), customer.getId(), Authority.CUSTOMER_USER);
       // 激活CUSTOMER_USER的管理员
-      activeTBUser(tbUser.getId(),userDTO.getPassword());
+      activeTBUser(tbUser.getId(), userDTO.getPassword(),null,false);
     }
     return ResponseEntity.ok(
         userService.saveAccount(
@@ -180,8 +207,7 @@ public class TkUserController extends AbstractUserAccount {
             getCurrentUser().getCurrentTenantId()));
   }
-
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN'},{'api:yt:user:saveTenantAdmin:post'})")
+  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:user:saveTenantAdmin:post'})")
   @PostMapping("save_tenant_admin")
   public UserDTO saveTenantAdmin(@Validated(AddGroup.class) @RequestBody UserDTO userDTO)
       throws ThingsboardException {
@@ -190,7 +216,7 @@ public class TkUserController extends AbstractUserAccount {
     }
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     userService.validateTenantRole(userDTO.getTenantId());
-    //租户角色不存在，会留存脏数据
+    // 租户角色不存在，会留存脏数据
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(userDTO.getTenantId()));
     try {
       // 创建TB的租户管理员
@@ -200,14 +226,14 @@ public class TkUserController extends AbstractUserAccount {
       if (null == userDTO.getId()) {
         tbUser = createTBUser(tbUser, userDTO, tenantId, customerId, Authority.TENANT_ADMIN);
         // 激活租户管理员
-        activeTBUser(tbUser.getId(),accountProperties.getDefaultPassword());
+        activeTBUser(tbUser.getId(), accountProperties.getDefaultPassword(),tbUser.getTenantId(),true);
       }
     } catch (Exception e) {
       throw handleException(e);
     }
     return userService.saveTenantAdmin(
-            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
+        userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
   }
   @DeleteMapping
@@ -249,16 +275,16 @@ public class TkUserController extends AbstractUserAccount {
   @GetMapping("/account_exist/{username}")
   public ResponseResult<UserDTO> accountExist(@PathVariable String username)
       throws ThingsboardException {
-    return ResponseResult.success(
-        userService.accountExist(username));
+    return ResponseResult.success(userService.accountExist(username));
   }
   @ApiOperation(value = "判断电话是否重复")
   @GetMapping("/get_user/{phoneNumber}")
-  public ResponseResult<UserDTO> findUserByPhoneNumber(@PathVariable  String phoneNumber) throws ThingsboardException {
-    return ResponseResult.success(
-            userService.findUserByPhoneNumber(phoneNumber));
+  public ResponseResult<UserDTO> findUserByPhoneNumber(@PathVariable String phoneNumber)
+      throws ThingsboardException {
+    return ResponseResult.success(userService.findUserByPhoneNumber(phoneNumber));
   }
+
   @PostMapping("/relation")
   public String[] getUserRoleOrGroup(
       @Validated @RequestBody RoleOrOrganizationReqDTO roleOrGroupReqDTO) {
@@ -269,16 +295,14 @@ public class TkUserController extends AbstractUserAccount {
   @ApiOperation(value = "修改密码")
   public ResponseResult<Boolean> changePassword(@RequestBody AccountReqDTO accountReqDTO)
       throws ThingsboardException {
-    SysUserEntity user =
-        userService.validateChangePasswordAccount(accountReqDTO);
+    SysUserEntity user = userService.validateChangePasswordAccount(accountReqDTO);
     String resetPassword = accountReqDTO.getResetPassword();
     if (!getCurrentUser().isPtAdmin()) {
-      updatePassword(resetPassword,getCurrentUser());
+      updatePassword(resetPassword, getCurrentUser());
     }
     return ResponseResult.success(userService.changePassword(user));
   }
-
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN'},{})")
   @ApiOperation(value = "获取租户下对应组织的所有客户")
   @GetMapping("/customers/{organizationId}")
@@ -325,13 +349,17 @@ public class TkUserController extends AbstractUserAccount {
    * @param userId 用户ID
    * @throws ThingsboardException tb运行异常
    */
-  private void activeTBUser(UserId userId,String password) throws ThingsboardException {
+  private void activeTBUser(UserId userId, String password,TenantId tenantId ,boolean isPtAdmin) throws ThingsboardException {
     try {
       // 1、获取UserCredentials 并获取activateToken
-      User user = checkUserId(userId, Operation.READ);
-      SecurityUser authUser = getCurrentUser();
+      if(!isPtAdmin){
+        User user = checkUserId(userId, Operation.READ);
+        userId = user.getId();
+        SecurityUser authUser = getCurrentUser();
+        tenantId = authUser.getTenantId();
+      }
       UserCredentials userCredentials =
-          tbUserService.findUserCredentialsByUserId(authUser.getTenantId(), user.getId());
+          tbUserService.findUserCredentialsByUserId(tenantId, userId);
       // 2、进行激活
       String encodedPassword = passwordEncoder.encode(password);
       UserCredentials credentials =
@@ -362,7 +390,7 @@ public class TkUserController extends AbstractUserAccount {
       tbUser.setAuthority(authority);
       tbUser.setTenantId(tenantId);
       tbUser.setCustomerId(customerId);
-      tbUser.setEmail(userDTO.getUsername() +"@"+ accountProperties.getEmailSuffix());
+      tbUser.setEmail(userDTO.getUsername() + "@" + accountProperties.getEmailSuffix());
       tbUser = tbUserService.saveUser(tbUser);
       userDTO.setTbUser(tbUser.getId().getId().toString());
       logEntityAction(
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
View file @3478cd7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/SysUserServiceImpl.java
View file @3478cd7
@@ -60,21 +60,19 @@ import static org.thingsboard.server.common.data.yunteng.constant.ModelConstants
 public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserEntity>
     implements TkUserService {
+  public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final AdminSettingMapper adminSettingMapper;
   private final ObjectMapper mapper;
   private final RoleMapper roleMapper;
   private final OrganizationMapper organizationMapper;
   private final UserRoleMapper userRoleMapper;
   private final TenantRoleMapper tenantRoleMapper;
-
   private final TkSmsService tkSmsService;
   private final TkMessageTemplateService messageTemplateService;
   private final TkOrganizationService organizationService;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final SceneLinkageService sceneLinkageService;
   private final SceneLinkageMapper sceneLinkageMapper;
-
-  public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final PasswordEncoder passwordEncoder;
   private final CacheUtils cacheUtils;
@@ -83,6 +81,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   private final AccountProperties accountProperties;
   private final TenantMapper tenantMapper;
+
   @Override
   public List<UserDetailsDTO> findUserDetailsByUsername(String username, String tenantId) {
     // 多个租户可能存在多个username相同的情况
@@ -146,7 +145,8 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     if (null == userDTO.getId()) {
       SysUserEntity existUser =
           baseMapper.selectOne(
-              new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getUsername, userDTO.getUsername()));
+              new LambdaQueryWrapper<SysUserEntity>()
+                  .eq(SysUserEntity::getUsername, userDTO.getUsername()));
       if (null != existUser) {
         throw new YtDataValidationException(ErrorMessage.USER_NAME_ALREADY_EXISTS.getMessage());
       }
@@ -161,8 +161,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
         throw new YtDataValidationException(ErrorMessage.PROVIDE_CORRECT_EMAIL.getMessage());
       }
     }
-    if (StringUtils.isEmpty(userDTO.getEmail())
-        && StringUtils.isEmpty(userDTO.getPhoneNumber())) {
+    if (StringUtils.isEmpty(userDTO.getEmail()) && StringUtils.isEmpty(userDTO.getPhoneNumber())) {
       throw new YtDataValidationException(ErrorMessage.PHONE_NUMBER_OR_EMAIL_REQUIRED.getMessage());
     }
     boolean needCheck = true;
@@ -201,7 +200,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     SysUserEntity user = baseMapper.selectById(id);
-    return null !=user?user.getDTO(UserDTO.class):null;
+    return null != user ? user.getDTO(UserDTO.class) : null;
   }
   @Override
@@ -219,7 +218,9 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
           adminSettingMapper.selectList(
               new QueryWrapper<SysAdminSettingEntity>()
                   .lambda()
-                  .eq(SysAdminSettingEntity::getKey, ModelConstants.AdminSettingConfigKey.GENERAL_SETTING));
+                  .eq(
+                      SysAdminSettingEntity::getKey,
+                      ModelConstants.AdminSettingConfigKey.GENERAL_SETTING));
       SysAdminSettingEntity adminSetting = generalSetting.get(0);
       JsonNode configNode = mapper.readTree(adminSetting.getConfigJson());
       String baseUrl = configNode.get(FastIotConstants.ConfigJSONKey.BASE_URL).asText();
@@ -237,10 +238,17 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
       userInfoDTO.setNeedSetPwd(false);
     }
     AtomicReference<LocalDateTime> expireTime = new AtomicReference<>(user.getAccountExpireTime());
-    if(expireTime.get() == null){
-      SysTenantEntity tenant =tenantMapper.selectOne(new QueryWrapper<SysTenantEntity>().lambda().eq(SysTenantEntity::getTenantId,tenantId));
-      Optional.ofNullable(tenant).ifPresent(i -> {
-        expireTime.set(i.getTenantExpireTime());});
+    if (expireTime.get() == null) {
+      SysTenantEntity tenant =
+          tenantMapper.selectOne(
+              new QueryWrapper<SysTenantEntity>()
+                  .lambda()
+                  .eq(SysTenantEntity::getTenantId, tenantId));
+      Optional.ofNullable(tenant)
+          .ifPresent(
+              i -> {
+                expireTime.set(i.getTenantExpireTime());
+              });
     }
     userInfoDTO.setAccountExpireTime(expireTime.get());
     userInfoDTO.setUserId(userId);
@@ -325,15 +333,10 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
       queryMap.put("userIds", userIds);
     }
     if (isPtSysadmin) {
-      String roleType = (String) queryMap.get("roleType");
-      if (!StringUtils.isEmpty(roleType)) {
-        userPage = baseMapper.getTenantAdminPage(userIPage, tenantId);
+      if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
+        userPage = new Page<>();
       } else {
-        if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
-          userPage = new Page<>();
-        } else {
-          userPage = baseMapper.getUserPage(userIPage, queryMap);
-        }
+        userPage = baseMapper.getUserPage(userIPage, queryMap);
       }
     } else if (isTenantAdmin) {
       if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
@@ -356,6 +359,23 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     return getPageData(userPage, UserDTO.class);
   }
+  @Override
+  public YtPageData<UserDTO> tenantPage(Map<String, Object> queryMap, String tenantId) {
+    IPage<SysUserEntity> userIPage = getPage(queryMap, "create_time", false);
+    IPage<UserDTO> userPage = baseMapper.getTenantAdminPage(userIPage, tenantId);
+    if (null != userPage) {
+      userPage
+          .getRecords()
+          .forEach(
+              record -> {
+                fillUserStatus(record);
+                record.setHasPassword(StringUtils.isNotBlank(record.getActivateToken()));
+                record.setPassword(null);
+              });
+    }
+    return getPageData(userPage, UserDTO.class);
+  }
+
   private void fillUserStatus(UserDTO userDTO) {
     userDTO.setUserStatusEnum(UserStatusEnum.NORMAL);
     if (!userDTO.isEnabled()) {
@@ -395,18 +415,16 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     baseMapper.deleteBatchIds(userIds);
     // 5、删除场景联动
-    Wrapper filter = new QueryWrapper<TkSceneLinkageEntity>().lambda()
-                    .in(TkSceneLinkageEntity::getCreator,userIds);
-    List<TkSceneLinkageEntity> sceneLinkages =sceneLinkageMapper.selectList(filter);
-    if(sceneLinkages ==null || sceneLinkages.isEmpty()){
+    Wrapper filter =
+        new QueryWrapper<TkSceneLinkageEntity>()
+            .lambda()
+            .in(TkSceneLinkageEntity::getCreator, userIds);
+    List<TkSceneLinkageEntity> sceneLinkages = sceneLinkageMapper.selectList(filter);
+    if (sceneLinkages == null || sceneLinkages.isEmpty()) {
       return true;
     }
-    Set<String> sceneIds = sceneLinkages.stream()
-            .map(i -> i.getId())
-            .collect(Collectors.toSet());
-    sceneLinkageService.deleteSceneLinkage(sceneIds, tenantId,null);
-
-
+    Set<String> sceneIds = sceneLinkages.stream().map(i -> i.getId()).collect(Collectors.toSet());
+    sceneLinkageService.deleteSceneLinkage(sceneIds, tenantId, null);
     return true;
   }
@@ -423,12 +441,14 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     user.setLevel(FastIotConstants.LevelValue.IS_TENANT_ADMIN);
     List<SysUserEntity> users =
         baseMapper.selectList(
-            new QueryWrapper<SysUserEntity>().lambda().eq(SysUserEntity::getUsername, userDTO.getUsername()));
+            new QueryWrapper<SysUserEntity>()
+                .lambda()
+                .eq(SysUserEntity::getUsername, userDTO.getUsername()));
     if (!users.isEmpty()) {
       throw new YtDataValidationException("用户已存在");
     }
     baseMapper.insert(user);
-    List<SysTenantRoleEntity> tenantRoleList =validateTenantRole(userDTO.getTenantId()) ;
+    List<SysTenantRoleEntity> tenantRoleList = validateTenantRole(userDTO.getTenantId());
     for (SysTenantRoleEntity tenantRole : tenantRoleList) {
       roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
     }
@@ -439,10 +459,10 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   @Override
   public List<SysTenantRoleEntity> validateTenantRole(String tenantId) {
     List<SysTenantRoleEntity> tenantRoleList =
-            tenantRoleMapper.selectList(
-                    new QueryWrapper<SysTenantRoleEntity>()
-                            .lambda()
-                            .eq(SysTenantRoleEntity::getTenantId, tenantId));
+        tenantRoleMapper.selectList(
+            new QueryWrapper<SysTenantRoleEntity>()
+                .lambda()
+                .eq(SysTenantRoleEntity::getTenantId, tenantId));
     // 保存用户与角色的映射信息
     if (null == tenantRoleList || tenantRoleList.size() == 0) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
@@ -493,20 +513,21 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     SysUserEntity user =
         baseMapper.selectOne(
-            new QueryWrapper<SysUserEntity>().lambda().eq(SysUserEntity::getPhoneNumber, phoneNumber));
+            new QueryWrapper<SysUserEntity>()
+                .lambda()
+                .eq(SysUserEntity::getPhoneNumber, phoneNumber));
-    if(StringUtils.isNotBlank(user.getTbUser())){
+    if (StringUtils.isNotBlank(user.getTbUser())) {
       UserId userId = new UserId(UUID.fromString(user.getTbUser()));
       UserCredentials userCredentials =
-              tbUserService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, userId);
+          tbUserService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, userId);
       userCredentials.setPassword(passwordEncoder.encode(pwd));
       tbUserService.replaceUserCredentials(
-              TenantId.fromUUID(UUID.fromString(user.getTenantId())), userCredentials);
+          TenantId.fromUUID(UUID.fromString(user.getTenantId())), userCredentials);
       //    eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
     }
-
     user.setPassword(pwd);
     changePassword(user);
   }
@@ -517,7 +538,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   }
   @Override
-  public void sendRestPasswordMsg(String tenantId,SendResetPasswordEmailMsg msg) {
+  public void sendRestPasswordMsg(String tenantId, SendResetPasswordEmailMsg msg) {
     // 通过用户ID查询用户信息
     SysUserEntity user = baseMapper.selectById(msg.getUserId());
     if (null == user) {
@@ -534,7 +555,8 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     List<MessageTemplateDTO> templateDTOList =
         messageTemplateService.findMessageTemplate(messageTemplateDTO);
     if (null == templateDTOList || templateDTOList.size() < 1) {
-      throw new YtDataValidationException(ErrorMessage.TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE.getMessage());
+      throw new YtDataValidationException(
+          ErrorMessage.TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE.getMessage());
     }
     if (messageType.equalsIgnoreCase(MessageTypeEnum.PHONE_MESSAGE.name())) {
       SmsReqDTO smsReqDTO = new SmsReqDTO();
@@ -569,15 +591,24 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     if (roleOrGroupReqDTO.isQueryRole()) {
       List<String> roleIds =
           userRoleMapper
-              .selectList(new QueryWrapper<SysUserRoleEntity>().lambda().eq(SysUserRoleEntity::getUserId, userId))
+              .selectList(
+                  new QueryWrapper<SysUserRoleEntity>()
+                      .lambda()
+                      .eq(SysUserRoleEntity::getUserId, userId))
               .stream()
               .map(SysUserRoleEntity::getRoleId)
               .collect(Collectors.toList());
-      List<String> enableRoles = roleMapper.selectList(new QueryWrapper<SysRoleEntity>().lambda()
-                      .eq(SysRoleEntity::isEnabled, true).in(SysRoleEntity::getId,roleIds))
-              .stream().map(m -> m.getId())
+      List<String> enableRoles =
+          roleMapper
+              .selectList(
+                  new QueryWrapper<SysRoleEntity>()
+                      .lambda()
+                      .eq(SysRoleEntity::isEnabled, true)
+                      .in(SysRoleEntity::getId, roleIds))
+              .stream()
+              .map(m -> m.getId())
               .collect(Collectors.toList());
-      if(enableRoles.size() == 0){
+      if (enableRoles.size() == 0) {
         return null;
       }
       return enableRoles.toArray(new String[enableRoles.size()]);
@@ -631,7 +662,7 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
     }
     if (isTenantAdmin) {
       List<String> userList =
-          userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,organizationId);
+          userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, organizationId);
       if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
         return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
       }
@@ -654,7 +685,9 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE
   public UserDTO checkAccount(String userId, Integer level) {
     SysUserEntity user =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<SysUserEntity>().eq(SysUserEntity::getId, userId).eq(SysUserEntity::getLevel, level));
+            new LambdaQueryWrapper<SysUserEntity>()
+                .eq(SysUserEntity::getId, userId)
+                .eq(SysUserEntity::getLevel, level));
     return null != user ? user.getDTO(UserDTO.class) : null;
   }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkUserService.java
View file @3478cd7
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/TkUserService.java
View file @3478cd7
@@ -34,6 +34,7 @@ public interface TkUserService {
       Map<String, Object> queryMap,
       boolean isPtSysadmin,
       boolean isTenantAdmin);
+  YtPageData<UserDTO> tenantPage(Map<String, Object> queryMap,String tenantId);
   UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId);