fix: 租户下的客户同步删除TB的客户完成

@@ -434,7 +434,7 @@ public abstract class BaseController {
         return getCurrentUser().getTenantId();
     }
 
-    Customer checkCustomerId(CustomerId customerId, Operation operation) throws ThingsboardException {
+    protected Customer checkCustomerId(CustomerId customerId, Operation operation) throws ThingsboardException {
         try {
             validateId(customerId, "Incorrect customerId " + customerId);
             Customer customer = customerService.findCustomerById(getTenantId(), customerId);

@@ -18,10 +18,8 @@ import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.id.CustomerId;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.id.*;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.event.UserAuthDataChangedEvent;
@@ -177,9 +175,18 @@ public class YtUserController extends BaseController {
   }
 
   @DeleteMapping
+  @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')")
   public void deleteUser(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     // 如果当前用户是租户管理员，则代表创建的用户为CUSTOMER_USER,则需要调用TB,否则为本平台的管理员不需要调用TB
+    boolean isTenantAdminOperator = getCurrentUser().isPtTenantAdmin();
+    if(isTenantAdminOperator){
+      for (String id : deleteDTO.getIds()) {
+        String customerId = userService.findUserCustomerIdById(id);
+        //删除Customer_User
+        deleteCustomer(customerId);
+      }
+    }
     userService.deleteUser(
         deleteDTO.getIds(), getCurrentUser().isPtSysadmin(), getCurrentUser().getCurrentTenantId());
   }
@@ -331,4 +338,25 @@ public class YtUserController extends BaseController {
       throw handleException(e);
     }
   }
+
+  /**
+   * 删除租户下的客户
+   * @param strCustomerId 客户ID
+   * @throws ThingsboardException tb运行异常
+   */
+  private void deleteCustomer(String strCustomerId) throws ThingsboardException {
+    try{
+      CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+      Customer customer = checkCustomerId(customerId, Operation.DELETE);
+      List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(getTenantId(), customerId);
+      customerService.deleteCustomer(getTenantId(), customerId);
+      logEntityAction(customerId, customer,
+              customer.getId(),
+              ActionType.DELETED, null, strCustomerId);
+      sendDeleteNotificationMsg(getTenantId(), customerId, relatedEdgeIds);
+      tbClusterService.broadcastEntityStateChangeEvent(getTenantId(), customerId, ComponentLifecycleEvent.DELETED);
+    }catch (Exception e){
+      throw handleException(e);
+    }
+  }
 }

@@ -31,7 +31,7 @@ public enum ErrorMessage {
   SEND_DESTINATION_NOT_FOUND(400012,"通知失败！找不到发送目标"),
   USER_NAME_ALREADY_EXISTS(400013,"用户名已存在"),
   DATA_ALREADY_EXISTS(400014,"数据已存在,无需重复添加"),
-  CONNECT_TO_TB_ERROR(500001,"与TB联系错误"),
+  USER_NOT_EXISTS(400015,"用户不存在"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -131,7 +131,7 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
       return ytPageData;
     } catch (Exception e) {
       log.error("create TBAlarmInfo error {}", e.getMessage());
-      throw new YtDataValidationException(ErrorMessage.CONNECT_TO_TB_ERROR.getMessage());
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     //return getPageData(alarmInfoIPage,AlarmInfoDTO.class);
   }

@@ -52,7 +52,6 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
 
   private final AdminSettingMapper adminSettingMapper;
   private final ObjectMapper mapper;
-  private final TenantMapper tenantMapper;
   private final RoleMapper roleMapper;
   private final OrganizationMapper organizationMapper;
   private final UserRoleMapper userRoleMapper;
@@ -464,6 +463,18 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
+  public String findUserCustomerIdById(String id) {
+    if(StringUtils.isAllEmpty(id)){
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    String customerId = baseMapper.findUserCustomerIdById(id);
+    if(null == customerId){
+      throw new YtDataValidationException(ErrorMessage.USER_NOT_EXISTS.getMessage());
+    }
+    return customerId;
+  }
+
+  @Override
   public UserDTO accountExist(String userName, String tenantId) {
     if (StringUtils.isEmpty(userName)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());

@@ -35,4 +35,6 @@ public interface UserMapper extends BaseMapper<User> {
       @Param("userId") String userId, @Param("activeToken") String activeToken);
 
   UserDTO findUserInfo(UserDTO userDTO);
+
+  String findUserCustomerIdById(@Param("userId") String userId);
 }

@@ -17,23 +17,29 @@ import java.util.Set;
 public interface YtUserService {
   List<UserDetailsDTO> findUserDetailsByUsername(String username);
 
-  UserDTO saveAccount(UserDTO userDTO, boolean sendEmail, boolean sendMsg,boolean isTenantAdmin,String tenantId);
+  UserDTO saveAccount(
+      UserDTO userDTO, boolean sendEmail, boolean sendMsg, boolean isTenantAdmin, String tenantId);
 
-  String getActivationLink(String userId,boolean isPtSysadmin,String tenantId);
+  String getActivationLink(String userId, boolean isPtSysadmin, String tenantId);
 
-  Optional<UserDTO> getUser(String userId,boolean isPtSysadmin,String tenantId);
+  Optional<UserDTO> getUser(String userId, boolean isPtSysadmin, String tenantId);
 
-  UserInfoDTO me(String userId,String tenantId,Set<String> currentRoles);
+  UserInfoDTO me(String userId, String tenantId, Set<String> currentRoles);
 
-  YtPageData<UserDTO> page(Map<String, Object> queryMap, boolean isPtSysadmin, boolean isPlatformAdmin, boolean isTenantAdmin, String tenantId);
+  YtPageData<UserDTO> page(
+      Map<String, Object> queryMap,
+      boolean isPtSysadmin,
+      boolean isPlatformAdmin,
+      boolean isTenantAdmin,
+      String tenantId);
 
-  UserDTO updateUser(UserDTO userDTO,boolean isPtSysadmin,String tenantId);
+  UserDTO updateUser(UserDTO userDTO, boolean isPtSysadmin, String tenantId);
 
-  boolean deleteUser(Set<String> userIds,boolean isPtSysadmin,String tenantId);
+  boolean deleteUser(Set<String> userIds, boolean isPtSysadmin, String tenantId);
 
-  UserDTO saveTenantAdmin(UserDTO userDTO,boolean isPtSysadmin,String tenantId);
+  UserDTO saveTenantAdmin(UserDTO userDTO, boolean isPtSysadmin, String tenantId);
 
-  void resetPassword(String userId,boolean isPtSysadmin,String tenantId);
+  void resetPassword(String userId, boolean isPtSysadmin, String tenantId);
 
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
 
@@ -53,11 +59,12 @@ public interface YtUserService {
    * @param username 账号
    * @return 账号信息
    */
-  UserDTO accountExist(String username,String tenantId);
+  UserDTO accountExist(String username, String tenantId);
 
   User validateChangePasswordAccount(AccountReqDTO accountReqDTO);
 
-  Optional<List<UserDTO>> getOrganizationUserByOrganizationId(String organizationId,String tenantId);
+  Optional<List<UserDTO>> getOrganizationUserByOrganizationId(
+      String organizationId, String tenantId);
 
   /**
    * 查询用户关联的Role或者Group
@@ -74,4 +81,12 @@ public interface YtUserService {
    * @return 修改成功、失败
    */
   boolean changePassword(User user);
+
+  /**
+   * 通过用户ID查找TB的CustomerId
+   *
+   * @param id 用户ID
+   * @return CustomerId
+   */
+  String findUserCustomerIdById(String id);
 }

@@ -172,4 +172,9 @@
         WHERE su.username=#{username}
         AND su.tenant_id=#{tenantId}
     </select>
+
+    <select id="findUserCustomerIdById" resultType="java.lang.String">
+        SELECT tu.customer_id FROM sys_user su LEFT JOIN tb_user tu ON su.tb_user =  CAST(tu.id AS VARCHAR)
+        WHERE su.id = #{userId}
+    </select>
 </mapper>