Merge branch '2023-12-27' into 'master_dev'

feat:增加TCP产品导入物模型限制

See merge request yunteng/thingskit!299

@@ -119,6 +119,7 @@ public enum ErrorMessage {
   IMPORT_TCP_SERVICE_ERROR(400094,"品类无法创建TCP产品的服务，请在产品内添加"),
   EZVIZ_API_ERROR(400095,"荧石视频获取TokenAPI调用失败【%s】，错误码【%s】"),
   EZVIZ_GET_URL_ERROR(400096,"荧石API调用获取URL失败！！"),
+  IMPORT_TCP_ERROR(400097,"TCP产品不能导入INT,DOUBLE,BOOL,TEXT以外的数据类型属性！！"),
   HAVE_NO_PERMISSION(500002,"没有修改权限"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置");
 

@@ -335,6 +335,17 @@ public class ThingsModelServiceImpl
     }
     if (Objects.equals(importThingsModel.getFunctionType(), FunctionTypeEnum.all)
         || Objects.equals(importThingsModel.getFunctionType(), FunctionTypeEnum.properties)) {
+      if(transportType.equals("TCP")){
+        List<AttributeModelDTO> dto =  importThingsModel.getData().getProperties();
+        if (null != dto && !dto.isEmpty()) {
+          for (AttributeModelDTO model : dto) {
+           String dataType = model.getSpecs().path("dataType").path("type").asText();
+           if(!StringUtils.isEmpty(dataType)&&!dataType.equals("INT")&&!dataType.equals("DOUBLE")&&!dataType.equals("TEXT")&&!dataType.equals("BOOL")){
+             throw new TkDataValidationException(ErrorMessage.IMPORT_TCP_ERROR.getMessage());
+           }
+          }
+        }
+      }
       importAttribute(
           identifiers,
           importThingsModel.getData().getProperties(),