Merge branch '2024-1-8' into 'master_dev'

feat:物模型TSL增加FunctionType枚举

See merge request yunteng/thingskit!311

 package org.thingsboard.server.common.data.yunteng.dto;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 
 @Data
 public class BaseModelDTO {
@@ -10,4 +12,7 @@ public class BaseModelDTO {
 
   @ApiModelProperty(value = "标识符")
   private String identifier;
+
+  @ApiModelProperty(value = "功能类型")
+  private FunctionTypeEnum functionType;
 }

@@ -272,6 +272,7 @@ public class ThingsModelServiceImpl
               AttributeModelDTO attributeModelDTO = new AttributeModelDTO();
               BeanUtils.copyProperties(thingsModelDTO, attributeModelDTO);
               attributeModelDTO.setSpecs(functionJson);
+              attributeModelDTO.setFunctionType(FunctionTypeEnum.properties);
               serviceList.add(attributeModelDTO);
               break;
             case services:
@@ -279,12 +280,14 @@ public class ThingsModelServiceImpl
               BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
               serviceDTO.setInputData(functionJson.get(inputData));
               serviceDTO.setOutputData(functionJson.get(outputData));
+              serviceDTO.setFunctionType(FunctionTypeEnum.services);
               serviceList.add(serviceDTO);
               break;
             case events:
               EventModelDTO eventDTO = new EventModelDTO();
               BeanUtils.copyProperties(thingsModelDTO, eventDTO);
               eventDTO.setOutputData(functionJson.get(outputData));
+              eventDTO.setFunctionType(FunctionTypeEnum.events);
               serviceList.add(eventDTO);
               break;
             default: