Merge remote-tracking branch 'origin/master' into ljl1207

@@ -358,7 +358,7 @@ public abstract class BaseController {
         }
     }
 
-    UUID toUUID(String id) {
+    protected UUID toUUID(String id) {
         return UUID.fromString(id);
     }
 

 package org.thingsboard.server.controller.yunteng;
 
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.util.Assert;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.EdgeId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.MenuDTO;
 import org.thingsboard.server.common.data.yunteng.dto.TenantDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
@@ -20,10 +29,12 @@ import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.tenant.TenantService;
+import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.MenuService;
 import org.thingsboard.server.dao.yunteng.service.YtTenantService;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import org.thingsboard.server.service.install.InstallScripts;
+import org.thingsboard.server.service.security.permission.Operation;
 
 import java.io.IOException;
 import java.net.URI;
@@ -42,6 +53,7 @@ public class YtAdminController extends BaseController {
   private final YtUserService userService;
   private final TenantService tenantService;
   private final InstallScripts installScripts;
+  private final UserService tbUserService;
 
   @PostMapping("/tenant")
   public ResponseEntity<TenantDTO> saveTenant(@RequestBody TenantReqDTO tenantReqDTO) {
@@ -88,21 +100,26 @@ public class YtAdminController extends BaseController {
   }
 
   @DeleteMapping("/tenant")
-  public void deleteTenant(@RequestBody String[] ids) {
-    Assert.notNull(ids, "ids cannot be null");
-    if (ids.length == 0) {
-      throw new YtDataValidationException("id cannot be empty");
-    }
-    ytTenantService.deleteTenants(ids);
+  public void deleteTenant(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO) {
+    // TODO 删除TB
+    ytTenantService.deleteTenants(
+        deleteDTO.getIds().toArray(new String[deleteDTO.getIds().size()]));
   }
 
   @DeleteMapping("/user/deleteTenantAdmin")
-  public void deleteTenantAdmin(@RequestBody String[] ids) throws ThingsboardException {
-    Assert.notNull(ids, "ids cannot be null");
-    userService.deleteUser(
-        new HashSet<>(Arrays.asList(ids)),
-        getCurrentUser().isPtSysadmin(),
-        getCurrentUser().getCurrentTenantId());
+  public ResponseEntity<Boolean> deleteTenantAdmin(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+      throws ThingsboardException {
+    for (String strUserId : deleteDTO.getIds()) {
+      UserDTO userDTO = userService.findUserInfoById(strUserId);
+      if(null != userDTO && StringUtils.isNotBlank(userDTO.getTbUser())){
+        deleteTenantAdmin(userDTO.getTbUser());
+      }else {
+        return ResponseEntity.ok(false);
+      }
+    }
+    boolean result = userService.deleteUser(
+        deleteDTO.getIds(), getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
+    return ResponseEntity.ok(result);
   }
 
   @GetMapping("/tenant/getById/{id}")
@@ -143,32 +160,60 @@ public class YtAdminController extends BaseController {
         menuService.getMyMenus(
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().getCurrentUserId(),
-            getCurrentUser().isPtSysadmin(), getCurrentUser().isPtTenantAdmin()));
+            getCurrentUser().isPtSysadmin(),
+            getCurrentUser().isPtTenantAdmin()));
   }
 
   @PutMapping("/menu/assign/{tenantId}")
   public void assignMenuToTenant(
-      @RequestBody String[] menuIds, @PathVariable("tenantId") String tenantId) throws ThingsboardException {
+      @RequestBody String[] menuIds, @PathVariable("tenantId") String tenantId)
+      throws ThingsboardException {
     menuService.assignMenuToTenant(getCurrentUser().getCurrentTenantId(), menuIds);
   }
 
   @PostMapping("tenant/updateOrCreateTenant")
   public TenantDTO updateOrCreateTenant(
-      @Validated(UpdateGroup.class) @RequestBody TenantReqDTO tenantReqDTO) throws IOException {
-    boolean newTenant = tenantReqDTO.getId() == null;
-    //增加TB的租户创建
-    Tenant tbTenant = new Tenant();
-    tbTenant.setTitle(tenantReqDTO.getName());
-    tbTenant = tenantService.saveTenant(tbTenant);
-    if(newTenant){
-      installScripts.createDefaultRuleChains(tbTenant.getId());
-      installScripts.createDefaultEdgeRuleChains(tbTenant.getId());
-    }
-    tenantProfileCache.evict(tbTenant.getId());
-    tbClusterService.onTenantChange(tbTenant, null);
-    tbClusterService.broadcastEntityStateChangeEvent(tbTenant.getId(), tbTenant.getId(),
-            newTenant ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-    tenantReqDTO.setTenantId(tbTenant.getTenantId().toString());
+      @Validated(UpdateGroup.class) @RequestBody TenantReqDTO tenantReqDTO)
+      throws ThingsboardException {
+    updateOrSaveTenant(tenantReqDTO);
     return ytTenantService.updateOrCreateTenant(tenantReqDTO);
   }
+
+  private void deleteTenantAdmin(String strUserId) throws ThingsboardException {
+    try {
+      UserId currentUserId = new UserId(toUUID(strUserId));
+      User user = checkUserId(currentUserId, Operation.DELETE);
+      List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(getTenantId(), currentUserId);
+      tbUserService.deleteUser(getTenantId(), currentUserId);
+      logEntityAction(
+          currentUserId, user, user.getCustomerId(), ActionType.DELETED, null, strUserId);
+      sendDeleteNotificationMsg(getTenantId(), currentUserId, relatedEdgeIds);
+    } catch (Exception e) {
+      logEntityAction(emptyId(EntityType.USER), null, null, ActionType.DELETED, e, strUserId);
+      throw handleException(e);
+    }
+  }
+
+  private void updateOrSaveTenant(TenantReqDTO tenantReqDTO) throws ThingsboardException {
+    try {
+      boolean isCreate = tenantReqDTO.getId() == null;
+      // 增加TB的租户创建
+      Tenant tbTenant = new Tenant();
+      tbTenant.setTitle(tenantReqDTO.getName());
+      tbTenant = tenantService.saveTenant(tbTenant);
+      if (isCreate) {
+        installScripts.createDefaultRuleChains(tbTenant.getId());
+        installScripts.createDefaultEdgeRuleChains(tbTenant.getId());
+      }
+      tenantProfileCache.evict(tbTenant.getId());
+      tbClusterService.onTenantChange(tbTenant, null);
+      tbClusterService.broadcastEntityStateChangeEvent(
+          tbTenant.getId(),
+          tbTenant.getId(),
+          isCreate ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+      tenantReqDTO.setTenantId(tbTenant.getTenantId().toString());
+    } catch (Exception e) {
+      throw handleException(e);
+    }
+  }
 }

@@ -40,7 +40,6 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import org.thingsboard.server.service.security.model.SecurityUser;
-import org.thingsboard.server.service.security.model.UserPrincipal;
 import org.thingsboard.server.service.security.permission.Operation;
 
 import javax.servlet.http.HttpServletRequest;
@@ -152,6 +151,7 @@ public class YtUserController extends BaseController {
     if(StringUtils.isAllBlank(userDTO.getTenantId())){
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
+    userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
     TenantId tenantId = new TenantId(UUID.fromString(userDTO.getTenantId()));
     try{
       //创建TB的租户管理员

@@ -29,6 +29,7 @@ public enum ErrorMessage {
   TENANT_MISMATCHING(400010,"租户不匹配"),
   GET_CURRENT_USER_EXCEPTION(400011,"获取当前用户信息异常"),
   SEND_DESTINATION_NOT_FOUND(400012,"通知失败！找不到发送目标"),
+  USER_NAME_ALREADY_EXISTS(400013,"用户名已存在"),
   CONNECT_TO_TB_ERROR(500001,"与TB联系错误"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;

 package org.thingsboard.server.dao.yunteng.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -46,7 +47,8 @@ import static org.thingsboard.server.common.data.yunteng.constant.ModelConstants
 @Service
 @Slf4j
 @RequiredArgsConstructor
-public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> implements YtUserService {
+public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
+    implements YtUserService {
 
   private final AdminSettingMapper adminSettingMapper;
   private final ObjectMapper mapper;
@@ -72,12 +74,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
   @Override
   @Transactional
-  public UserDTO saveAccount(UserDTO userDTO, boolean sendEmail, boolean sendMsg,boolean isPtSysadmin,String tenantId) {
+  public UserDTO saveAccount(
+      UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isPtSysadmin, String tenantId) {
     boolean isAdminOperate = isPtSysadmin;
-    if (StringUtils.isAllBlank(userDTO.getUsername())) {
-      throw new YtDataValidationException("username is required");
-    }
-    validatePhoneNumberAndEmail(userDTO);
     if (sendMsg && StringUtils.isAllBlank(userDTO.getPhoneNumber())) {
       throw new YtDataValidationException(
           "you must specify user phone number if you want send activate email to this user");
@@ -99,9 +98,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
         user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
         int tenantExist =
             tenantMapper.selectCount(
-                new QueryWrapper<Tenant>()
-                    .lambda()
-                    .eq(Tenant::getTenantId, userDTO.getTenantId()));
+                new QueryWrapper<Tenant>().lambda().eq(Tenant::getTenantId, userDTO.getTenantId()));
         if (tenantExist == 0) {
           throw new YtDataValidationException("tenant must exist");
         }
@@ -140,13 +137,22 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
         userRoleMapper.insert(userRole);
       }
       // 绑定用户和组织的关系
-      groupService.bindUserToOrganization(tenantId,user.getId(), userDTO.getOrganizationIds());
+      groupService.bindUserToOrganization(tenantId, user.getId(), userDTO.getOrganizationIds());
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
       return userDTO;
     }
   }
 
-  private void validatePhoneNumberAndEmail(UserDTO userDTO) {
+  @Override
+  public void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO) {
+    if(null == userDTO.getId()){
+      User existUser =
+              baseMapper.selectOne(
+                      new LambdaQueryWrapper<User>().eq(User::getUsername, userDTO.getUsername()));
+      if (null != existUser) {
+        throw new YtDataValidationException(ErrorMessage.USER_NAME_ALREADY_EXISTS.getMessage());
+      }
+    }
     if (StringUtils.isNotBlank(userDTO.getPhoneNumber())) {
       if (!CHINA_MOBILE_PATTERN.matcher(userDTO.getPhoneNumber()).matches()) {
         throw new YtDataValidationException(ErrorMessage.PROVIDE_CORRECT_PHONE_NUMBER.getMessage());
@@ -164,10 +170,17 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
 
   @Override
-  public String getActivationLink(String userId,boolean isPtSysadmin,String tenantId) {
+  public UserDTO findUserInfoById(String id) {
+    if(StringUtils.isEmpty(id)){
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return baseMapper.selectById(id).getDTO(UserDTO.class);
+  }
+
+  @Override
+  public String getActivationLink(String userId, boolean isPtSysadmin, String tenantId) {
     User user = baseMapper.selectById(userId);
-    if (!isPtSysadmin
-        && tenantId.equals(user.getTenantId())) {
+    if (!isPtSysadmin && tenantId.equals(user.getTenantId())) {
       throw new AccessDeniedException(
           "you don't have permission to get activation link for this user");
     }
@@ -190,7 +203,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
 
   @Override
-  public UserInfoDTO me(String userId,String tenantId,Set<String> currentRoles) {
+  public UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles) {
     User user = baseMapper.selectById(userId);
     UserInfoDTO userInfoDTO = new UserInfoDTO();
     if (!StringUtils.isEmpty(user.getActivateToken())) {
@@ -215,13 +228,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
 
   @Override
-  public Optional<UserDTO> getUser(String userId,boolean isPtSysadmin,String tenantId) {
+  public Optional<UserDTO> getUser(String userId, boolean isPtSysadmin, String tenantId) {
     User user = baseMapper.selectById(userId);
     if (user != null) {
       UserDTO userDTO = new UserDTO();
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
-      if (!isPtSysadmin
-          && !tenantId.equals(user.getTenantId())) {
+      if (!isPtSysadmin && !tenantId.equals(user.getTenantId())) {
         return Optional.empty();
       }
       return Optional.of(userDTO);
@@ -232,17 +244,16 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
   @Override
   @Transactional
-  public UserDTO updateUser(UserDTO userDTO,boolean isPtSysadmin,String tenantId) {
+  public UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId) {
     Assert.notNull(userDTO.getId(), "user is must be specified");
     User user = baseMapper.selectById(userDTO.getId());
-    if (!isPtSysadmin
-        && !user.getTenantId().equals(tenantId)) {
+    if (!isPtSysadmin && !user.getTenantId().equals(tenantId)) {
       throw new NoneTenantAssetException("this user not belong to current tenant");
     }
     if (!user.getUsername().equals(userDTO.getUsername())) {
       throw new YtDataValidationException("username is immutable");
     }
-    validatePhoneNumberAndEmail(userDTO);
+    validateUserNameAndPhoneNumberAndEmail(userDTO);
     user.setRealName(userDTO.getRealName());
     user.setEnabled(userDTO.isEnabled());
     user.setPhoneNumber(userDTO.getPhoneNumber());
@@ -270,14 +281,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
       if (StringUtils.isEmpty(roleType)) {
         roleType = RoleEnum.PLATFORM_ADMIN.name();
       }
-      userPage =
-          baseMapper.getAdminUserPage(
-              userIPage, tenantId, roleType);
-    }
-    else if(isPlatformAdmin){
-      //平台管理员只能管理租户
+      userPage = baseMapper.getAdminUserPage(userIPage, tenantId, roleType);
+    } else if (isPlatformAdmin) {
+      // 平台管理员只能管理租户
       userPage = baseMapper.selectAllTenantUser(userIPage);
-    }else if(isTenantAdmin){
+    } else if (isTenantAdmin) {
       Map<String, Object> map = new HashMap<>();
       map.put("realName", queryMap.get("realName"));
       map.put("username", queryMap.get("username"));
@@ -315,7 +323,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
   @Override
   @Transactional
-  public boolean deleteUser(Set<String> userIds,boolean isPtSysadmin,String tenantId) {
+  public boolean deleteUser(Set<String> userIds, boolean isPtSysadmin, String tenantId) {
     // 1. 判断是否所有的id都属于此人
     if (!isPtSysadmin) {
       int notTenantUserCount =
@@ -343,11 +351,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
   @Override
   @Transactional
-  public UserDTO saveTenantAdmin(UserDTO userDTO,boolean isPtSysadmin,String tenantId) {
+  public UserDTO saveTenantAdmin(UserDTO userDTO, boolean isPtSysadmin, String tenantId) {
     if (StringUtils.isNotBlank(userDTO.getId())) {
-      return updateUser(userDTO,isPtSysadmin,tenantId);
+      return updateUser(userDTO, isPtSysadmin, tenantId);
     }
-    validatePhoneNumberAndEmail(userDTO);
     User user = new User();
     userDTO.copyToEntity(user, ID, PASSWORD, CREATE_TIME, UPDATE_TIME, ACTIVATE_TOKEN);
     user.setPassword(passwordEncoder.encode(FastIotConstants.DEFAULT_PWD));
@@ -376,7 +383,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
 
   @Override
   @Transactional
-  public void resetPassword(String userId,boolean isPtSysadmin,String tenantId) {
+  public void resetPassword(String userId, boolean isPtSysadmin, String tenantId) {
     if (isPtSysadmin) {
       baseMapper.setPassword2NullAndInsertActiveToken(
           userId, RandomStringUtils.randomAlphabetic(10));
@@ -428,10 +435,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
 
   @Override
-  public Optional<List<UserDTO>> getOrganizationUserByOrganizationId(String groupId,String tenantId) {
+  public Optional<List<UserDTO>> getOrganizationUserByOrganizationId(
+      String groupId, String tenantId) {
     Organization group = organizationMapper.selectById(groupId);
-    if (group == null
-        || !group.getTenantId().equals(tenantId)) {
+    if (group == null || !group.getTenantId().equals(tenantId)) {
       return Optional.empty();
     }
     Set<String> userIds =
@@ -500,7 +507,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User> imp
   }
 
   @Override
-  public UserDTO accountExist(String userName,String tenantId) {
+  public UserDTO accountExist(String userName, String tenantId) {
     if (StringUtils.isEmpty(userName)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }

@@ -36,6 +36,9 @@ public interface YtUserService {
 
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
 
+  void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO);
+
+  UserDTO findUserInfoById(String id);
   /**
    * 发送密码重置新消息
    *

@@ -161,9 +161,7 @@
         SELECT
         <include refid="columns"/>
         FROM sys_user su
-        <where>
-            <if test="username !=null and username!=''">AND su.username=#{username}</if>
-            <if test="tenantId !=null and tenantId!=''">AND su.tenant_id=#{tenantId}</if>
-        </where>
+        WHERE su.username=#{username}
+        AND su.tenant_id=#{tenantId}
     </select>
 </mapper>