Merge branch '20220906' into 'master'

fix: 租户角色不存在时，第二次提交表单提示用户名已经存在的问题

See merge request huang/thingsboard3.3.2!128

@@ -130,8 +130,6 @@ public class YtAdminController extends BaseController {
       UserDTO userDTO = userService.findUserInfoById(strUserId);
       if (null != userDTO && StringUtils.isNotBlank(userDTO.getTbUser())) {
         deleteTenantAdmin(userDTO.getTbUser());
-      } else {
-        return ResponseEntity.ok(false);
       }
     }
     boolean result =

@@ -22,6 +22,9 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
+import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
+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.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
@@ -84,6 +87,9 @@ public class YtDeviceProfileController extends BaseController {
             if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
                 isSoftwareChanged = true;
             }
+            if (FastIotConstants.ASSERT_DEFAULT_NAME.equals(oldDeviceProfile.getName()) && !Objects.equals(deviceProfile.getName(), oldDeviceProfile.getName())) {
+                throw new YtDataValidationException(ErrorMessage.ASSERT_DEFAULT_NAME_NO_CHANGED.getMessage());
+            }
         }
 
         DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));

@@ -185,9 +185,9 @@ public class YtUserController extends AbstractUserAccount {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     userService.validateUserNameAndPhoneNumberAndEmail(userDTO);
+    userService.validateTenantRole(userDTO.getTenantId());
+    //租户角色不存在，会留存脏数据
     TenantId tenantId = TenantId.fromUUID(UUID.fromString(userDTO.getTenantId()));
-    UserDTO returnUser = userService.saveTenantAdmin(
-            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
     try {
       // 创建TB的租户管理员
       CustomerId customerId = new CustomerId(EntityId.NULL_UUID);
@@ -202,7 +202,8 @@ public class YtUserController extends AbstractUserAccount {
       throw handleException(e);
     }
 
-    return returnUser;
+    return userService.saveTenantAdmin(
+            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
   }
 
   @DeleteMapping

@@ -11,6 +11,7 @@ public interface FastIotConstants {
   String FIRST_PAGE_NAME = "第 1 页";
   String CHART_EXECUTE_CONDITION = "executeCondition";
   String CHART_EXECUTE_ATTRIBUTES = "executeAttributes";
+  String ASSERT_DEFAULT_NAME = "default";
   class DefaultOrder {
     public static final String CREATE_TIME="create_time";
   }

@@ -73,6 +73,8 @@ public enum ErrorMessage {
   EXPORT_CONFIG_NON_EXISTENT(400053,"报表配置不存在或已被删除"),
   START_TIME_NOT_MORE_THAN_END_TIME(400054,"开始时间不能大于结束时间"),
   START_TIME_OR_END_TIME_EXCEPTION(400055,"开始时间或结束时间异常"),
+  TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE(400056,"密码重置成功，请自行通知用户！"),
+  ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private String message;

@@ -128,7 +128,7 @@ public class AlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMap
                 sceneIds.add(action.getSceneLinkageId());
             }
             List<SceneLinkage> scenes = sceneLinkageMapper.selectList(new QueryWrapper<SceneLinkage>().lambda()
-                    .eq(SceneLinkage::getId, sceneIds)
+                    .in(SceneLinkage::getId, sceneIds)
             );
             for(SceneLinkage item: scenes){
                 sceneNames.add(item.getName());

@@ -427,15 +427,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException("用户已存在");
     }
     baseMapper.insert(user);
-    List<TenantRole> tenantRoleList =
-        tenantRoleMapper.selectList(
-            new QueryWrapper<TenantRole>()
-                .lambda()
-                .eq(TenantRole::getTenantId, userDTO.getTenantId()));
-    // 保存用户与角色的映射信息
-    if (null == tenantRoleList || tenantRoleList.size() == 0) {
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
+    List<TenantRole> tenantRoleList =validateTenantRole(userDTO.getTenantId()) ;
     for (TenantRole tenantRole : tenantRoleList) {
       roleMapper.saveUserRoleMapping(user.getId(), tenantRole.getRoleId());
     }
@@ -444,6 +436,20 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
+  public List<TenantRole> validateTenantRole(String tenantId) {
+    List<TenantRole> tenantRoleList =
+            tenantRoleMapper.selectList(
+                    new QueryWrapper<TenantRole>()
+                            .lambda()
+                            .eq(TenantRole::getTenantId, tenantId));
+    // 保存用户与角色的映射信息
+    if (null == tenantRoleList || tenantRoleList.size() == 0) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return tenantRoleList;
+  }
+
+  @Override
   @Transactional
   public void resetPassword(String userId, String tenantId, String password) {
     UserDTO userDTO = findUserInfoById(userId);
@@ -527,7 +533,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     List<MessageTemplateDTO> templateDTOList =
         messageTemplateService.findMessageTemplate(messageTemplateDTO);
     if (null == templateDTOList || templateDTOList.size() < 1) {
-      throw new YtDataValidationException(ErrorMessage.TARGET_TEMPLATE_NOT_EXISTS.getMessage());
+      throw new YtDataValidationException(ErrorMessage.TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE.getMessage());
     }
     if (messageType.equalsIgnoreCase(MessageTypeEnum.PHONE_MESSAGE.name())) {
       SmsReqDTO smsReqDTO = new SmsReqDTO();

@@ -8,6 +8,7 @@ import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.RoleOrOrganizationReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.yunteng.entities.TenantRole;
 import org.thingsboard.server.dao.yunteng.entities.User;
 
 import java.time.LocalDateTime;
@@ -48,6 +49,12 @@ public interface YtUserService {
 
   void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO);
 
+  /**
+   * 验证租户角色是否有效
+   * @param tenantId
+   */
+  List<TenantRole> validateTenantRole(String tenantId);
+
   UserDTO findUserInfoById(String id);
   /**
    * 发送密码重置新消息