refactor: 第三方平台用户，绑定即新增

云中非
1 parent 87e80e72
Showing 4 changed files with 25 additions and 26 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtThirdPlatformController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/YtThirdUserDTO.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtThirdPlatformServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtThirdPlatformService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtThirdPlatformController.java
View file @f264222
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtThirdPlatformController.java
View file @f264222
@@ -13,6 +13,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtThirdUserDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.ThirdPlatformEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.entities.YtOpinionEntity;
@@ -38,6 +39,7 @@ public class YtThirdPlatformController extends BaseController {
     public YtPageData<YtThirdUserDTO> pageAlarmProfile(
             @RequestParam(PAGE_SIZE) int pageSize,
             @RequestParam(PAGE) int page,
+            @RequestParam(value = "platformName", required = false) ThirdPlatformEnum platformName,
             @RequestParam(value = "name", required = false) String name,
             @RequestParam(value = ORDER_FILED, required = false) String orderBy,
             @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
@@ -45,11 +47,11 @@ public class YtThirdPlatformController extends BaseController {
         IPage<YtThirdUserEntity> pageInfrom = thirdService.getPage(page, pageSize, orderBy, orderType);
-        return thirdService.pageDatas(pageInfrom,name);
+        return thirdService.pageDatas(pageInfrom,platformName,name);
     }
-    @PostMapping("public")
-    @ApiOperation("新增|编辑")
+    @PostMapping
+    @ApiOperation("绑定|编辑")
     public YtThirdUserDTO saveOrUpdateAlarmProfile(
             @Validated @RequestBody YtThirdUserDTO dto) throws ThingsboardException {
         return thirdService.saveOrUpdate(dto);
@@ -63,11 +65,5 @@ public class YtThirdPlatformController extends BaseController {
         return thirdService.deleteDataByIds(deleteDTO);
     }
-    @PostMapping("{sysUserId}/{thirdUserId}")
-    @ApiOperation("绑定")
-    public boolean bind(@PathVariable("sysUserId") String sysUserId,@PathVariable("thirdUserId") String thirdUserId)
-            throws ThingsboardException {
-        return thirdService.bind(sysUserId, thirdUserId);
-    }
 }
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/YtThirdUserDTO.java
View file @f264222
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/dto/YtThirdUserDTO.java
View file @f264222
@@ -26,7 +26,8 @@ public class YtThirdUserDTO extends BaseDTO {
     @ApiModelProperty(value = "用户头像", required = false)
     private String avatarUrl;
-    @ApiModelProperty(value = "系统用户ID", required = false)
+    @ApiModelProperty(value = "系统用户ID", required = true)
+    @NotEmpty(message = "系统用户ID不能为空")
     private String appUserId;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtThirdPlatformServiceImpl.java
View file @f264222
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtThirdPlatformServiceImpl.java
View file @f264222
@@ -14,9 +14,12 @@ 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.YtOpinionDTO;
 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.YtOpinionEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
+import org.thingsboard.server.dao.yunteng.mapper.UserMapper;
 import org.thingsboard.server.dao.yunteng.mapper.YtOpinionMapper;
 import org.thingsboard.server.dao.yunteng.mapper.YtThirdPlatformMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
@@ -32,12 +35,13 @@ import java.util.List;
 public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatformMapper, YtThirdUserEntity>
     implements YtThirdPlatformService {
-  private final UserOrganizationMappingService userOrganizationMappingService;
+  private final UserMapper userMapper;
   @Override
-  public YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, String name) {
+  public YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName, String name) {
     Wrapper pageFilter = new QueryWrapper<YtThirdUserEntity>()
             .lambda()
+            .eq(pageInfrom != null,YtThirdUserEntity::getPlatformName,platformName)
             .like(StringUtils.isNotEmpty(name),YtThirdUserEntity::getNickName,name);
     IPage<YtThirdUserEntity> page = baseMapper.selectPage(pageInfrom, pageFilter);
     return getPageData(page, YtThirdUserDTO.class);
@@ -50,6 +54,14 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
   @Override
   @Transactional(rollbackFor=Exception.class)
   public YtThirdUserDTO saveOrUpdate(YtThirdUserDTO videoDTO) {
+    User user = userMapper.selectById(videoDTO.getAppUserId());
+    if(user == null){
+
+    }
+    if(StringUtils.isEmpty(user.getAvatar()) && StringUtils.isNotEmpty(videoDTO.getAvatarUrl())){
+      user.setAvatar(videoDTO.getAvatarUrl());
+      userMapper.updateById(user);
+    }
     Wrapper filter = new QueryWrapper<YtThirdUserEntity>().lambda()
             .eq(YtThirdUserEntity::getThirdUserId,videoDTO.getThirdUserId());
     YtThirdUserEntity oldVideo = baseMapper.selectOne(filter);
@@ -72,11 +84,6 @@ public class YtThirdPlatformServiceImpl extends AbstractBaseService<YtThirdPlatf
     return baseMapper.delete(filter) > 0;
   }
-  @Override
-  public boolean bind(String userId, String thirdId) {
-
-    return false;
-  }
   @Override
   public String accessToken(String appKey, String appSecret) {
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtThirdPlatformService.java
View file @f264222
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtThirdPlatformService.java
View file @f264222
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.YtOpinionDTO;
 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.YtOpinionEntity;
 import org.thingsboard.server.dao.yunteng.entities.YtThirdUserEntity;
@@ -21,11 +22,11 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
      * @param name            第三方平台用户昵称
      * @return
      */
-    YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom,String name);
+    YtPageData<YtThirdUserDTO> pageDatas(IPage<YtThirdUserEntity> pageInfrom, ThirdPlatformEnum platformName,String name);
-    /**
+    /** 第三方平台用户与系统用户绑定
      * @param dto
      * @return
      */
@@ -38,13 +39,7 @@ public interface YtThirdPlatformService extends BaseService<YtThirdUserEntity> {
     boolean deleteDataByIds(DeleteDTO deleteDTO);
-    /**
-     * 第三方平台用户与系统用户绑定
-     * @param userId   系统用户主键
-     * @param thirdId  第三方平台用户唯一标识符
-     * @return
-     */
-    boolean bind(String userId, String thirdId);
+
     /**
      * 访问令牌