Merge branch '20220920' into 'master'

fix(DEFECT-741): 设备重名提示内容调整

See merge request huang/thingsboard3.3.2!133

@@ -68,10 +68,9 @@ public class YtDeviceController extends BaseController {
       @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO)
       @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO)
       throws ThingsboardException, ExecutionException, InterruptedException {
       throws ThingsboardException, ExecutionException, InterruptedException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    boolean enable = deviceService.validateFormdata(currentTenantId, deviceDTO);
-    if (!enable) {
-      ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
-    }
+    deviceService.validateFormdata(currentTenantId, deviceDTO);
+
+
     DeviceDTO newDeviceDTO = null;
     DeviceDTO newDeviceDTO = null;
     boolean isIncludeRelation = false;
     boolean isIncludeRelation = false;
 
 

@@ -215,6 +215,7 @@ public class YtDeviceProfileController extends BaseController {
         tbDeviceProfile.setType(DeviceProfileType.DEFAULT);
         tbDeviceProfile.setType(DeviceProfileType.DEFAULT);
         UUID tenantId = UUID.fromString(deviceProfileDTO.getTenantId());
         UUID tenantId = UUID.fromString(deviceProfileDTO.getTenantId());
         tbDeviceProfile.setTenantId(TenantId.fromUUID(tenantId));
         tbDeviceProfile.setTenantId(TenantId.fromUUID(tenantId));
+        tbDeviceProfile.setDefault(deviceProfileDTO.isDefault());
 
 
         // 获取当前租户的默认规则链
         // 获取当前租户的默认规则链
         if (StringUtils.isNotBlank(deviceProfileDTO.getDefaultRuleChainId())) {
         if (StringUtils.isNotBlank(deviceProfileDTO.getDefaultRuleChainId())) {

@@ -42,7 +42,7 @@ public class YtNoAuthController{
   @PostMapping("/send_login_code/{phoneNumber}")
   @PostMapping("/send_login_code/{phoneNumber}")
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
     Assert.isTrue(
     Assert.isTrue(
-        CHINA_MOBILE_PATTERN.matcher(phoneNumber).matches(), "please input correct phone number");
+        CHINA_MOBILE_PATTERN.matcher(phoneNumber).matches(), "请输入有效电话号码");
     return smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_LOGIN);
     return smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_LOGIN);
   }
   }
 
 

@@ -73,7 +73,7 @@ public class YtNoticeController extends BaseController {
     }
     }
 
 
     @DeleteMapping("delete")
     @DeleteMapping("delete")
-    @PreAuthorize("@check.checkPermissions({},{'api:yt:notice:delete'})")
+    @PreAuthorize("@check.checkPermissions({},{'api:yt:notice:delete:delete'})")
     @ApiOperation("批量删除")
     @ApiOperation("批量删除")
     public void delete(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
     public void delete(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
         sysNoticeService.delete(deleteDTO.getIds(), getCurrentUser().getCurrentTenantId());
         sysNoticeService.delete(deleteDTO.getIds(), getCurrentUser().getCurrentTenantId());

@@ -79,6 +79,8 @@ public enum ErrorMessage {
   TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE(400056,"密码重置成功，请自行通知用户！"),
   TARGET_TEMPLATE_NOT_EXISTS_SELF_NOTICE(400056,"密码重置成功，请自行通知用户！"),
   ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
   ASSERT_DEFAULT_NAME_NO_CHANGED(400056,"系统预制资源，不能修改名称！"),
   DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
   DATA_BOARD_IS_PRIVATE(400057,"该数据看板不是公有视图"),
+  MESSAGE_SEND_TOO_FAST(400058,"1分钟内请求次数过多，请休息一下！"),
+  PASSWORD_INCORRECT(4010059, "密码错误!"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -3,7 +3,6 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -13,7 +12,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
@@ -34,9 +32,7 @@ import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
 
 
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -92,25 +88,22 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
   }
 
 
   @Override
   @Override
-  public boolean validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
+  public void validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     String deviceTenantId = deviceDTO.getTenantId();
     String deviceTenantId = deviceDTO.getTenantId();
     if (StringUtils.isBlank(deviceDTO.getName())) {
     if (StringUtils.isBlank(deviceDTO.getName())) {
-      throw new YtDataValidationException("device name cannot be blank");
+      throw new YtDataValidationException("设备名称不能为空");
     }
     }
     // validate IOT DB
     // validate IOT DB
     if (StringUtils.isBlank(deviceDTO.getProfileId())) {
     if (StringUtils.isBlank(deviceDTO.getProfileId())) {
-      throw new YtDataValidationException("device profile cannot be blank");
+      throw new YtDataValidationException("设备配置不能为空");
     }
     }
 
 
     // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
     // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
+    if (deviceNameUsed(currentTenantId, deviceDTO.getName(),deviceDTO.getId())) {
+      throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+    }
     if (insert) {
     if (insert) {
-      DeviceDTO check = new DeviceDTO();
-      check.setName(deviceDTO.getName());
-      if (findTbDeviceId(deviceTenantId, check).size() > 0) {
-        throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
-      }
-
       deviceTenantId = currentTenantId;
       deviceTenantId = currentTenantId;
       deviceDTO.setTenantId(currentTenantId);
       deviceDTO.setTenantId(currentTenantId);
     } else {
     } else {
@@ -127,6 +120,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         sceneNotUsed(currentTenantId, deviceDTO.getTbDeviceId(), oldOrganizationId);
         sceneNotUsed(currentTenantId, deviceDTO.getTbDeviceId(), oldOrganizationId);
       }
       }
     }
     }
+
     // 验证数据profileId的正确性
     // 验证数据profileId的正确性
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     DeviceProfile deviceProfile =
     DeviceProfile deviceProfile =
@@ -137,7 +131,6 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
       throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
       throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
     }
-    return true;
   }
   }
 
 
   /**
   /**
@@ -367,17 +360,21 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
   }
 
 
   @Override
   @Override
-  public List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO) {
+  public boolean deviceNameUsed(String tenantId, String deviceName,String deviceId) {
     List<YtDevice> deviceList =
     List<YtDevice> deviceList =
-        baseMapper.selectList(
-            new QueryWrapper<YtDevice>()
+        baseMapper.selectList(new QueryWrapper<YtDevice>()
                 .lambda()
                 .lambda()
                 .eq(true, YtDevice::getTenantId, tenantId)
                 .eq(true, YtDevice::getTenantId, tenantId)
-                .eq(
-                    StringUtils.isNotBlank(deviceDTO.getName()),
-                    YtDevice::getName,
-                    deviceDTO.getName()));
-    return ReflectUtils.sourceToTarget(deviceList, DeviceDTO.class);
+                .eq(YtDevice::getName,deviceName));
+    for(YtDevice dev: deviceList){
+      if(deviceName.equals(dev.getName())
+              && (StringUtils.isEmpty(deviceId) || !deviceId.equals(dev.getId()))
+      ){
+        return true;
+      }
+    }
+
+    return false;
   }
   }
 
 
   @Override
   @Override

@@ -134,7 +134,7 @@ public class YtSmsServiceImpl implements YtSmsService {
                 })
                 })
             .orElse(true);
             .orElse(true);
     if (!canSend) {
     if (!canSend) {
-      return false;
+      throw new YtDataValidationException(ErrorMessage.MESSAGE_SEND_TOO_FAST.getMessage());
     }
     }
     List<MessageTemplate> messageTemplates =
     List<MessageTemplate> messageTemplates =
         messageTemplateMapper.selectList(
         messageTemplateMapper.selectList(

@@ -693,7 +693,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     // 判断用户密码是否正确
     // 判断用户密码是否正确
     boolean isMatch = passwordEncoder.matches(accountReqDTO.getPassword(), user.getPassword());
     boolean isMatch = passwordEncoder.matches(accountReqDTO.getPassword(), user.getPassword());
     if (!isMatch) {
     if (!isMatch) {
-      throw new YtDataValidationException(ErrorMessage.USERNAME_PASSWORD_INCORRECT.getMessage());
+      throw new YtDataValidationException(ErrorMessage.PASSWORD_INCORRECT.getMessage());
     }
     }
     user.setPassword(accountReqDTO.getResetPassword());
     user.setPassword(accountReqDTO.getResetPassword());
   }
   }

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
-import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
@@ -30,7 +29,7 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      *
      *
      * @param ytDevice
      * @param ytDevice
      */
      */
-    boolean validateFormdata(String currentTenantId, DeviceDTO ytDevice);
+    void validateFormdata(String currentTenantId, DeviceDTO ytDevice);
 
 
     /**
     /**
      * 查询所有的设备信息
      * 查询所有的设备信息
@@ -38,7 +37,7 @@ public interface YtDeviceService extends BaseService<YtDevice> {
      * @param deviceDTO 过滤参数
      * @param deviceDTO 过滤参数
      * @return List<DeviceDTO>
      * @return List<DeviceDTO>
      */
      */
-    List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO);
+  boolean deviceNameUsed(String tenantId, String deviceName,String deviceId);
 
 
     List<String> findTbDeviceId(String tenantId, Set<String> ids);
     List<String> findTbDeviceId(String tenantId, Set<String> ids);