refactor: 第三方平台用户绑定和解绑接口逻辑优化

1、绑定的时候验证平台用户是否已经绑定
2、解绑的时候只能操作同一租户下的账号

@@ -65,16 +65,15 @@ public class YtThirdPlatformController extends BaseController {
     @ApiOperation("绑定")
     public JwtTokenPair saveOrUpdateAlarmProfile(
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
-        UserDTO userDto = thirdService.saveOrUpdate(dto);
+        UserDTO userDto = thirdService.bindUser(dto);
         return buildJwtToken(userDto);
     }
 
     @DeleteMapping
-    @ApiOperation("删除")
-    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody DeleteDTO deleteDTO)
+    @ApiOperation("解绑")
+    public boolean deleteAlarmProfile(@Validated(DeleteGroup.class) @RequestBody YtThirdUserDTO dto)
             throws ThingsboardException {
-        deleteDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-        return thirdService.deleteDataByIds(deleteDTO);
+        return thirdService.unbindUser(getCurrentUser().getCurrentTenantId(), dto.getAppUserId(),dto.getThirdUserId());
     }
 
     @GetMapping("login/{thirdId}")

@@ -59,7 +59,8 @@ public enum ErrorMessage {
   DEVICE_LOSED(400039,"设备相关参数丢失"),
   SCENE_REACT_NOT_EXTIED(400040,"场景联动不存在"),
   DEVICE_USED_SCENE_REACT(400041,"场景联动【%s】正在使用该设备"),
-  SCENE_REACT_USED_ALARM_PROFILE(400041,"场景联动正在使用该告警配置"),
+  SCENE_REACT_USED_ALARM_PROFILE(400042,"场景联动正在使用该告警配置"),
+  APP_USER_BINDED(400043,"账号【%s】已绑定"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -60,7 +60,7 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public UserDTO saveOrUpdate(YtThirdUserDTO dto) {
+    public UserDTO bindUser(YtThirdUserDTO dto) {
         User user = null;
         switch (dto.getLoginMethod()) {
             case PHONE:
@@ -73,21 +73,21 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
         if (user == null) {
             throw new YtDataValidationException(ErrorMessage.USER_NOT_EXISTS.getMessage());
         }
+
+        Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
+                .eq(YtThirdUserEntity::getAppUserId, user.getId());
+        YtThirdUserEntity oldBind = baseMapper.selectOne(filter);
+        if(oldBind != null){
+            throw new YtDataValidationException(String.format(ErrorMessage.APP_USER_BINDED.getMessage(),user.getUsername()));
+        }
+
         if (StringUtils.isEmpty(user.getAvatar()) && StringUtils.isNotEmpty(dto.getAvatarUrl())) {
             user.setAvatar(dto.getAvatarUrl());
             userMapper.updateById(user);
         }
         dto.setAppUserId(user.getId());
+        baseMapper.insert(dto.getEntity(YtThirdUserEntity.class));
 
-        Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
-                .eq(YtThirdUserEntity::getThirdUserId, dto.getThirdUserId());
-        YtThirdUserEntity oldVideo = baseMapper.selectOne(filter);
-        if (null == oldVideo) {
-            baseMapper.insert(dto.getEntity(YtThirdUserEntity.class));
-        } else {
-            dto.setId(oldVideo.getId());
-            baseMapper.updateById(dto.getEntity(YtThirdUserEntity.class));
-        }
         return user.getDTO(UserDTO.class);
     }
 
@@ -159,9 +159,15 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean deleteDataByIds(DeleteDTO deleteDTO) {
+    public boolean unbindUser(String tenantId,String appUserId,String thirdUserId) {
+
+        User user = userMapper.selectById(appUserId);
+        if(!tenantId.equals(user.getTenantId())){
+            throw new YtDataValidationException(ErrorMessage.NO_PERMISSION.getMessage());
+        }
         Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
-                .in(YtThirdUserEntity::getId, deleteDTO.getIds());
+                .eq(YtThirdUserEntity::getAppUserId,appUserId)
+                .eq(YtThirdUserEntity::getThirdUserId,thirdUserId);
         return baseMapper.delete(filter) > 0;
     }
 

@@ -7,7 +7,6 @@ import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.User;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
 
 /**
@@ -32,13 +31,15 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
      * @param dto
      * @return
      */
-    UserDTO saveOrUpdate(YtThirdUserDTO dto);
+    UserDTO bindUser(YtThirdUserDTO dto);
 
     /**
-     * @param deleteDTO
+     * 第三方平台用户与系统用户解绑
+     * @param appUserId
+     * @param thirdUserId
      * @return
      */
-    boolean deleteDataByIds(DeleteDTO deleteDTO);
+    boolean unbindUser(String tenantId,String appUserId,String thirdUserId);
 
     /**
      * 第三方登录