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

1、新增设备时，设备名称已存在 2、编辑设备时，设备名称已存在

fix(DEFECT-741): 设备重名提示内容调整
1、新增设备时，设备名称已存在 2、编辑设备时，设备名称已存在
云中非
1 parent d1d067bc
Showing 3 changed files with 24 additions and 29 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDeviceServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
View file @5c32456
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtDeviceController.java
View file @5c32456
@@ -68,10 +68,9 @@ public class YtDeviceController extends BaseController {
       @Validated(AddGroup.class) @RequestBody DeviceDTO deviceDTO)
       throws ThingsboardException, ExecutionException, InterruptedException {
     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;
     boolean isIncludeRelation = false;
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDeviceServiceImpl.java
View file @5c32456
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/YtDeviceServiceImpl.java
View file @5c32456
@@ -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.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.fasterxml.jackson.databind.JsonNode;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -13,7 +12,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 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.TenantId;
 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.YtDeviceService;
-import java.time.Instant;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -92,25 +88,22 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
   @Override
-  public boolean validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
+  public void validateFormdata(String currentTenantId, DeviceDTO deviceDTO) {
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     String deviceTenantId = deviceDTO.getTenantId();
     if (StringUtils.isBlank(deviceDTO.getName())) {
-      throw new YtDataValidationException("device name cannot be blank");
+      throw new YtDataValidationException("设备名称不能为空");
     }
     // validate IOT DB
     if (StringUtils.isBlank(deviceDTO.getProfileId())) {
-      throw new YtDataValidationException("device profile cannot be blank");
+      throw new YtDataValidationException("设备配置不能为空");
     }
     // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
+    if (deviceNameUsed(currentTenantId, deviceDTO.getName(),deviceDTO.getId())) {
+      throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+    }
     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;
       deviceDTO.setTenantId(currentTenantId);
     } else {
@@ -127,6 +120,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
         sceneNotUsed(currentTenantId, deviceDTO.getTbDeviceId(), oldOrganizationId);
       }
     }
+
     // 验证数据profileId的正确性
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     DeviceProfile deviceProfile =
@@ -137,7 +131,6 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
       throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
-    return true;
   }
   /**
@@ -367,17 +360,21 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
   @Override
-  public List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO) {
+  public boolean deviceNameUsed(String tenantId, String deviceName,String deviceId) {
     List<YtDevice> deviceList =
-        baseMapper.selectList(
-            new QueryWrapper<YtDevice>()
+        baseMapper.selectList(new QueryWrapper<YtDevice>()
                 .lambda()
                 .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
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
View file @5c32456
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/service/YtDeviceService.java
View file @5c32456
 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.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
@@ -30,7 +29,7 @@ public interface YtDeviceService extends BaseService<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 过滤参数
      * @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);