Merge branch '2024-1-30-bug' into 'master_dev'

fix:1.流媒体配置编辑时未校验名称重复；2.导入失败提示优化

See merge request yunteng/thingskit!322

@@ -253,32 +253,32 @@ public class ThingsModelController extends BaseController {
         String functionName = row.getCell(0).toString();//功能名称
         String functionName = row.getCell(0).toString();//功能名称
         if(StringUtils.isEmpty(functionName)){
         if(StringUtils.isEmpty(functionName)){
           failed++;
           failed++;
-          failedString.append("第"+i+"条，功能名称未填\r\n");
+          failedString.append("第"+i+"条，功能名称未填；");
           continue;
           continue;
         }
         }
         String identifier = row.getCell(1).toString();//标识符*
         String identifier = row.getCell(1).toString();//标识符*
         if(StringUtils.isEmpty(identifier)){
         if(StringUtils.isEmpty(identifier)){
           failed++;
           failed++;
-          failedString.append("第"+i+"条，标识符未填\r\n");
+          failedString.append("第"+i+"条，标识符未填；");
           continue;
           continue;
         }
         }
         String dataType = row.getCell(2).toString();//数据类型*
         String dataType = row.getCell(2).toString();//数据类型*
         if(StringUtils.isEmpty(dataType)){
         if(StringUtils.isEmpty(dataType)){
           failed++;
           failed++;
-          failedString.append("第"+i+"条，数据类型未填\r\n");
+          failedString.append("第"+i+"条，数据类型未填；");
           continue;
           continue;
         }
         }
         String accessMode = row.getCell(7).toString();//读写类型*
         String accessMode = row.getCell(7).toString();//读写类型*
         if(StringUtils.isEmpty(accessMode)){
         if(StringUtils.isEmpty(accessMode)){
           failed++;
           failed++;
-          failedString.append("第"+i+"条，读写类型未填\r\n");
+          failedString.append("第"+i+"条，读写类型未填；");
           continue;
           continue;
         }
         }
         Cell dataJons = row.getCell(9);//Josn对象
         Cell dataJons = row.getCell(9);//Josn对象
         if(dataType.equals("struct(结构体)")){
         if(dataType.equals("struct(结构体)")){
           if(StringUtils.isEmpty(dataJons.toString())){
           if(StringUtils.isEmpty(dataJons.toString())){
             failed++;
             failed++;
-            failedString.append("第"+i+"条，如果数据类型选为结构体则必填Json对象，请填入\r\n");
+            failedString.append("第"+i+"条，如果数据类型选为结构体则必填Json对象，请填入；");
             continue;
             continue;
           }
           }
         }
         }
@@ -287,7 +287,7 @@ public class ThingsModelController extends BaseController {
         Boolean identifierState = thingsModelService.getByIdentifier(tenantId,deviceProfileId,categoryId,identifier);
         Boolean identifierState = thingsModelService.getByIdentifier(tenantId,deviceProfileId,categoryId,identifier);
         if(!identifierState){
         if(!identifierState){
           failed++;
           failed++;
-          failedString.append("第"+i+"条，标识符已存在\r\n");
+          failedString.append("第"+i+"条，标识符已存在；");
           continue;
           continue;
         }
         }
         ThingsModelDTO dto = new ThingsModelDTO();
         ThingsModelDTO dto = new ThingsModelDTO();

@@ -43,6 +43,12 @@ public class TkVideoPlatformServiceImpl extends AbstractBaseService<TkVideoPlatf
     @Override
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     public TkVideoPlatformDTO saveOrUpdate(TkVideoPlatformDTO videoPlatformDTO) {
     public TkVideoPlatformDTO saveOrUpdate(TkVideoPlatformDTO videoPlatformDTO) {
+        TkVideoPlatformEntity entity = baseMapper.selectOne(new LambdaQueryWrapper<TkVideoPlatformEntity>()
+                .eq(TkVideoPlatformEntity::getHost, videoPlatformDTO.getHost())
+                .eq(TkVideoPlatformEntity::getTenantId,videoPlatformDTO.getTenantId()));
+        if (null != entity) {
+            throw new TkDataValidationException(ErrorMessage.VIDEO_PLATFORM_HOST_EXISTED.getMessage());
+        }
         if (StringUtils.isNotEmpty(videoPlatformDTO.getId())) {
         if (StringUtils.isNotEmpty(videoPlatformDTO.getId())) {
             Wrapper filter = new QueryWrapper<TkVideoPlatformEntity>().lambda()
             Wrapper filter = new QueryWrapper<TkVideoPlatformEntity>().lambda()
                     .eq(TkVideoPlatformEntity::getTenantId, videoPlatformDTO.getTenantId())
                     .eq(TkVideoPlatformEntity::getTenantId, videoPlatformDTO.getTenantId())
@@ -54,12 +60,6 @@ public class TkVideoPlatformServiceImpl extends AbstractBaseService<TkVideoPlatf
             }
             }
             baseMapper.updateById(videoPlatformDTO.getEntity(TkVideoPlatformEntity.class));
             baseMapper.updateById(videoPlatformDTO.getEntity(TkVideoPlatformEntity.class));
         } else {
         } else {
-            TkVideoPlatformEntity entity = baseMapper.selectOne(new LambdaQueryWrapper<TkVideoPlatformEntity>()
-                    .eq(TkVideoPlatformEntity::getHost, videoPlatformDTO.getHost())
-                    .eq(TkVideoPlatformEntity::getTenantId,videoPlatformDTO.getTenantId()));
-            if (null != entity) {
-                throw new TkDataValidationException(ErrorMessage.VIDEO_PLATFORM_HOST_EXISTED.getMessage());
-            }
             baseMapper.insert(videoPlatformDTO.getEntity(TkVideoPlatformEntity.class));
             baseMapper.insert(videoPlatformDTO.getEntity(TkVideoPlatformEntity.class));
         }
         }
         return videoPlatformDTO;
         return videoPlatformDTO;