Merge branch 'master' into ljl0223

云中非
2 parents 06517bbb d1b6e5dc
Showing 5 changed files with 64 additions and 36 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtUserController.java
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtUserServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtUserService.java
dao/src/main/resources/mapper/UserMapper.xml
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtUserController.java
View file @94d67e4
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtUserController.java
View file @94d67e4
@@ -241,7 +241,7 @@ public class YtUserController extends BaseController {
   @GetMapping("/findUserByPhoneNumber/{phoneNumber}")
   public ResponseResult<UserDTO> findUserByPhoneNumber(@PathVariable  String phoneNumber) throws ThingsboardException {
     return ResponseResult.success(
-            userService.findUserByPhoneNumber(phoneNumber,getCurrentUser().getCurrentTenantId()));
+            userService.findUserByPhoneNumber(phoneNumber));
   }
   @PostMapping("/relation")
   public String[] getUserRoleOrGroup(
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @94d67e4
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @94d67e4
@@ -41,6 +41,7 @@ public enum ErrorMessage {
   DEVICE_RELATION_IS_ABSENT(400022,"设备关联关系已不存在"),
   DATA_IS_DELETED(400023,"数据已经删除"),
   CONVERT_JS_IS_ALONE(400024,"转换脚本只能启用一个"),
+  PHONE_OR_EMAIL_HAS_REGISTER(400025,"手机或邮箱已被使用"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtUserServiceImpl.java
View file @94d67e4
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtUserServiceImpl.java
View file @94d67e4
@@ -118,7 +118,8 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
         userRoleMapper.insert(userRole);
       }
       // 绑定用户和组织的关系
-      organizationService.bindUserToOrganization(tenantId, user.getId(), userDTO.getOrganizationIds());
+      organizationService.bindUserToOrganization(
+          tenantId, user.getId(), userDTO.getOrganizationIds());
       user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
       return userDTO;
     }
@@ -148,6 +149,33 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
         && StringUtils.isAllBlank(userDTO.getPhoneNumber())) {
       throw new YtDataValidationException(ErrorMessage.PHONE_NUMBER_OR_EMAIL_REQUIRED.getMessage());
     }
+    boolean needCheck = false;
+    if (null != userDTO.getId()) {
+      User user = baseMapper.selectById(userDTO.getId());
+      if (!user.getPhoneNumber().equals(userDTO.getPhoneNumber())
+          || !user.getEmail().equals(userDTO.getEmail())) {
+        needCheck = true;
+      }
+    }
+    if (needCheck || null == userDTO.getId()) {
+      LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+      if (null == userDTO.getId()) {
+        queryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
+        queryWrapper.or().eq(User::getEmail, userDTO.getEmail());
+      }
+      if (needCheck) {
+        queryWrapper.ne(User::getId, userDTO.getId());
+        queryWrapper.and(
+            (userQueryWrapper -> {
+              userQueryWrapper.eq(User::getPhoneNumber, userDTO.getPhoneNumber());
+              userQueryWrapper.or().eq(User::getEmail, userDTO.getEmail());
+            }));
+      }
+      List<User> existPhoneOrEmail = baseMapper.selectList(queryWrapper);
+      if (null != existPhoneOrEmail && existPhoneOrEmail.size() >0) {
+        throw new YtDataValidationException(ErrorMessage.PHONE_OR_EMAIL_HAS_REGISTER.getMessage());
+      }
+    }
   }
   @Override
@@ -245,14 +273,14 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     user.setEmail(userDTO.getEmail());
     user.setAccountExpireTime(userDTO.getAccountExpireTime());
     user.setRemark(userDTO.getRemark());
-    if (userDTO.getPassword() !=null && !userDTO.getPassword().equals("******")) {
+    if (userDTO.getPassword() != null && !userDTO.getPassword().equals("******")) {
       user.setPassword(passwordEncoder.encode(userDTO.getPassword()));
     }
     baseMapper.updateById(user);
-    if(null != userDTO.getRoleIds()){
+    if (null != userDTO.getRoleIds()) {
       deleteAndAddUserRole(user.getId(), Arrays.asList(userDTO.getRoleIds()));
       userOrganizationMappingService.addOrUpdateUserOrganizationMapping(
-              user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
+          user.getId(), Arrays.asList(userDTO.getOrganizationIds()), true);
     }
     user.copyToDTO(userDTO, PASSWORD, ACTIVATE_TOKEN);
     return userDTO;
@@ -260,33 +288,32 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public YtPageData<UserDTO> page(
-      Map<String, Object> queryMap,
-      boolean isPtSysadmin,
-      boolean isTenantAdmin) {
+      Map<String, Object> queryMap, boolean isPtSysadmin, boolean isTenantAdmin) {
     String tenantId = (String) queryMap.get("tenantId");
     IPage<UserDTO> userPage = null;
     IPage<User> userIPage = getPage(queryMap, "create_time", false);
-    String organizationId = queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
+    String organizationId =
+        queryMap.get("organizationId") != null ? (String) queryMap.get("organizationId") : null;
     List<String> userIds = null;
-    if(null != organizationId){
-      userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId,organizationId);
-      queryMap.put("userIds",userIds);
+    if (null != organizationId) {
+      userIds = userOrganizationMappingService.getUserIdByOrganizationIds(tenantId, organizationId);
+      queryMap.put("userIds", userIds);
     }
     if (isPtSysadmin) {
       String roleType = (String) queryMap.get("roleType");
       if (!StringUtils.isEmpty(roleType)) {
         userPage = baseMapper.getTenantAdminPage(userIPage, tenantId);
       } else {
-        if(null != organizationId && (userIds.size()==FastIotConstants.MagicNumber.ZERO)){
+        if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
           userPage = new Page<>();
-        }else{
+        } else {
           userPage = baseMapper.getUserPage(userIPage, queryMap);
         }
       }
     } else if (isTenantAdmin) {
-      if(null != organizationId && (userIds.size()==FastIotConstants.MagicNumber.ZERO)){
+      if (null != organizationId && (userIds.size() == FastIotConstants.MagicNumber.ZERO)) {
         userPage = new Page<>();
-      }else{
+      } else {
         userPage = baseMapper.getUserPage(userIPage, queryMap);
       }
     }
@@ -475,11 +502,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public String findUserCustomerIdById(String id) {
-    if(StringUtils.isAllEmpty(id)){
+    if (StringUtils.isAllEmpty(id)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     String customerId = baseMapper.findUserCustomerIdById(id);
-    if(null == customerId){
+    if (null == customerId) {
       throw new YtDataValidationException(ErrorMessage.USER_NOT_EXISTS.getMessage());
     }
     return customerId;
@@ -498,14 +525,16 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
   @Override
-  public List<UserDTO> getMyCustomers(String organizationId,String tenantId, boolean isTenantAdmin) {
-    if(StringUtils.isEmpty(organizationId)){
+  public List<UserDTO> getMyCustomers(
+      String organizationId, String tenantId, boolean isTenantAdmin) {
+    if (StringUtils.isEmpty(organizationId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    if(isTenantAdmin){
-      List<String> userList = userOrganizationMappingService.getUserIdsByOrganizationId(organizationId);
-      if(null != userList && userList.size()>FastIotConstants.MagicNumber.ZERO){
-        return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(),userList);
+    if (isTenantAdmin) {
+      List<String> userList =
+          userOrganizationMappingService.getUserIdsByOrganizationId(organizationId);
+      if (null != userList && userList.size() > FastIotConstants.MagicNumber.ZERO) {
+        return baseMapper.getMyCustomers(tenantId, EntityId.NULL_UUID.toString(), userList);
       }
     }
     return null;
@@ -513,16 +542,17 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   @Async
-  public CompletableFuture<TsValue> findUsersAsyncByTs(LocalDateTime startTs, LocalDateTime endTs, long ts) {
+  public CompletableFuture<TsValue> findUsersAsyncByTs(
+      LocalDateTime startTs, LocalDateTime endTs, long ts) {
     DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
     String startTime = df.format(startTs);
     String endTime = df.format(endTs);
-    List<UserDTO> list = baseMapper.findUsersAsyncByTs(startTime,endTime);
-    return CompletableFuture.supplyAsync(()->new TsValue(ts,String.valueOf(list.size())));
+    List<UserDTO> list = baseMapper.findUsersAsyncByTs(startTime, endTime);
+    return CompletableFuture.supplyAsync(() -> new TsValue(ts, String.valueOf(list.size())));
   }
   @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());
     }
@@ -534,17 +564,16 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   /**
    * 判断手机号是否重复
-   * @param phoneNumber
-   * @param tenantId
+   *
+   * @param phoneNumber 手机号
    * @return
    */
   @Override
-  public UserDTO findUserByPhoneNumber(String phoneNumber, String tenantId) {
+  public UserDTO findUserByPhoneNumber(String phoneNumber) {
     if (StringUtils.isEmpty(phoneNumber)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     UserDTO userDTO = new UserDTO();
-    userDTO.setTenantId(tenantId);
     userDTO.setPhoneNumber(phoneNumber);
     return baseMapper.findUserInfoByPhoneNumber(userDTO);
   }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtUserService.java
View file @94d67e4
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtUserService.java
View file @94d67e4
@@ -64,11 +64,10 @@ public interface YtUserService {
   /**
    * 判断电话是否注册过
-   * @param phoneNumber
-   * @param tenantId
+   * @param phoneNumber 手机号
    * @return
    */
-  UserDTO findUserByPhoneNumber(String phoneNumber,String tenantId);
+  UserDTO findUserByPhoneNumber(String phoneNumber);
   User validateChangePasswordAccount(AccountReqDTO accountReqDTO);
--- a/dao/src/main/resources/mapper/UserMapper.xml
View file @94d67e4
+++ b/dao/src/main/resources/mapper/UserMapper.xml
View file @94d67e4
@@ -164,7 +164,6 @@
         <include refid="columns"/>
         FROM sys_user su
         WHERE su.phone_number=#{phoneNumber}
-        AND su.tenant_id=#{tenantId}
 </select>
     <select id="findUserCustomerIdById" resultType="java.lang.String">