fix: add release TSL and fix thingsModel some bug

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -18,6 +19,7 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
 import org.thingsboard.server.dao.yunteng.service.ThingsModelService;
@@ -97,6 +99,20 @@ public class ThingsModelController extends BaseController {
             functionType, getCurrentUser().getCurrentTenantId(), deviceProfileId));
             functionType, getCurrentUser().getCurrentTenantId(), deviceProfileId));
   }
   }
 
 
+  @PutMapping("/{deviceProfileId}")
+  @ApiOperation("物模型发布")
+  public ResponseEntity<Boolean> releaseTSL(@PathVariable("deviceProfileId") String deviceProfileId)
+      throws ThingsboardException {
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    DeviceProfileDTO dto = ytDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
+    if (null == dto) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(
+        thingsModelService.changeTSLStatus(
+            deviceProfileId, tenantId, StatusEnum.ENABLE.getIndex()));
+  }
+
   private ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO) throws ThingsboardException {
   private ThingsModelDTO saveOrUpdate(ThingsModelDTO thingsModelDTO) throws ThingsboardException {
 
 
     String tenantId = getCurrentUser().getCurrentTenantId();
     String tenantId = getCurrentUser().getCurrentTenantId();

@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
@@ -34,12 +36,24 @@ public class ThingsModelDTO extends TenantDTO {
   @ApiModelProperty("功能标识")
   @ApiModelProperty("功能标识")
   private String identifier;
   private String identifier;
 
 
+  @ApiModelProperty("调用方式：同步sync 异步async")
+  private CallTypeEnum callType;
+
+  @ApiModelProperty("读写模式：读r  写w")
+  private String accessMode;
+
+  @ApiModelProperty("事件类型：信息info 告警alert 故障error")
+  private DeviceEventTypeEnum eventType;
+
   @ApiModelProperty("功能json")
   @ApiModelProperty("功能json")
   @NotNull(
   @NotNull(
       message = "功能json不能为空",
       message = "功能json不能为空",
       groups = {AddGroup.class})
       groups = {AddGroup.class})
   private JsonNode functionJson;
   private JsonNode functionJson;
 
 
+  @ApiModelProperty("状态：0待发布 1发布")
+  private Integer status;
+
   @ApiModelProperty("设备配置ID")
   @ApiModelProperty("设备配置ID")
   @NotEmpty(
   @NotEmpty(
       message = "设备配置ID不能为空或空字符串",
       message = "设备配置ID不能为空或空字符串",

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum CallTypeEnum {
+    SYNC,
+    ASYNC
+}

+package org.thingsboard.server.common.data.yunteng.enums;
+
+public enum DeviceEventTypeEnum {
+  INFO,
+  ALERT,
+  ERROR
+}

@@ -8,6 +8,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceEventTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 
 
 @Data
 @Data
@@ -19,10 +21,14 @@ public class TkThingsModelEntity extends TenantBaseEntity {
 
 
   @TableField(typeHandler = EnumTypeHandler.class)
   @TableField(typeHandler = EnumTypeHandler.class)
   private FunctionTypeEnum functionType;
   private FunctionTypeEnum functionType;
-
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private CallTypeEnum callType;
+  private String accessMode;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private DeviceEventTypeEnum eventType;
   private String functionName;
   private String functionName;
   private String identifier;
   private String identifier;
-
+  private Integer status;
   @TableField(typeHandler = JacksonTypeHandler.class)
   @TableField(typeHandler = JacksonTypeHandler.class)
   private JsonNode functionJson;
   private JsonNode functionJson;
 
 

@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.dto.ThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DataTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkThingsModelEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkThingsModelEntity;
@@ -70,6 +71,7 @@ public class ThingsModelServiceImpl
     }
     }
     TkThingsModelEntity entity = thingsModelDTO.getEntity(TkThingsModelEntity.class);
     TkThingsModelEntity entity = thingsModelDTO.getEntity(TkThingsModelEntity.class);
     if (isAdd) {
     if (isAdd) {
+      entity.setStatus(StatusEnum.DISABLE.getIndex());
       baseMapper.insert(entity);
       baseMapper.insert(entity);
       thingsModelDTO.setId(entity.getId());
       thingsModelDTO.setId(entity.getId());
     } else {
     } else {
@@ -132,9 +134,10 @@ public class ThingsModelServiceImpl
             new LambdaQueryWrapper<TkThingsModelEntity>()
             new LambdaQueryWrapper<TkThingsModelEntity>()
                 .eq(TkThingsModelEntity::getTenantId, tenantId)
                 .eq(TkThingsModelEntity::getTenantId, tenantId)
                 .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId)
                 .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId)
-                .eq(TkThingsModelEntity::getFunctionType, typeEnum));
+                .eq(TkThingsModelEntity::getFunctionType, typeEnum)
+                .eq(TkThingsModelEntity::getStatus, StatusEnum.ENABLE.getIndex()));
     if (entityList.isEmpty()) {
     if (entityList.isEmpty()) {
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      return null;
     }
     }
     return entityList.stream()
     return entityList.stream()
         .map(obj -> obj.getDTO(ThingsModelDTO.class))
         .map(obj -> obj.getDTO(ThingsModelDTO.class))
@@ -154,12 +157,18 @@ public class ThingsModelServiceImpl
       DeviceTypeEnum deviceType = deviceProfileDTO.getDeviceType();
       DeviceTypeEnum deviceType = deviceProfileDTO.getDeviceType();
       jsonNode = getAttributeTSL(thingsModelDTOS, deviceType);
       jsonNode = getAttributeTSL(thingsModelDTOS, deviceType);
     } else if (typeEnum.equals(FunctionTypeEnum.services)) {
     } else if (typeEnum.equals(FunctionTypeEnum.services)) {
-
+      // TODO 服务
     }
     }
 
 
     return jsonNode;
     return jsonNode;
   }
   }
 
 
+  @Override
+  @Transactional
+  public boolean changeTSLStatus(String deviceProfileId, String tenantId, Integer status) {
+    return baseMapper.changeTSLStatus(deviceProfileId, tenantId, status);
+  }
+
   private JsonNode getAttributeTSL(
   private JsonNode getAttributeTSL(
       List<ThingsModelDTO> thingsModelDTOS, DeviceTypeEnum deviceType) {
       List<ThingsModelDTO> thingsModelDTOS, DeviceTypeEnum deviceType) {
     Map<String, List<ObjectNode>> attributeMap = new HashMap<>();
     Map<String, List<ObjectNode>> attributeMap = new HashMap<>();
@@ -167,25 +176,33 @@ public class ThingsModelServiceImpl
     List<ObjectNode> list = new ArrayList<>();
     List<ObjectNode> list = new ArrayList<>();
     for (ThingsModelDTO model : thingsModelDTOS) {
     for (ThingsModelDTO model : thingsModelDTOS) {
       ObjectNode objectNode = JacksonUtil.newObjectNode();
       ObjectNode objectNode = JacksonUtil.newObjectNode();
-      DataTypeEnum type =
-          model.getFunctionJson().get("type") != null
-              ? DataTypeEnum.valueOf(model.getFunctionJson().get("type").asText())
-              : null;
-      String identifier = model.getIdentifier();
-      switch (Objects.requireNonNull(type)) {
-        case INT:
-          objectNode.put(identifier, 0);
-          break;
-        case BOOL:
-          objectNode.put(identifier, "0");
-        case DOUBLE:
-          objectNode.put(identifier, 0.00);
-        case TEXT:
-          objectNode.put(identifier, "text");
-        case STRUCT:
-          objectNode.putPOJO(identifier, model.getFunctionJson().get("specs"));
-        default:
-          objectNode.put(identifier, "value");
+      JsonNode dataType = model.getFunctionJson().get("dataType");
+      if (null != dataType) {
+        DataTypeEnum type =
+            dataType.get("type") != null
+                ? DataTypeEnum.valueOf(dataType.get("type").asText())
+                : null;
+        String identifier = model.getIdentifier();
+        switch (Objects.requireNonNull(type)) {
+          case INT:
+            objectNode.put(identifier, 0);
+            break;
+          case BOOL:
+            objectNode.put(identifier, "0");
+            break;
+          case DOUBLE:
+            objectNode.put(identifier, 0.00);
+            break;
+          case TEXT:
+            objectNode.put(identifier, "text");
+            break;
+          case STRUCT:
+            objectNode.putPOJO(identifier, dataType.get("specs"));
+            break;
+          default:
+            objectNode.put(identifier, "value");
+            break;
+        }
       }
       }
       list.add(objectNode);
       list.add(objectNode);
     }
     }

@@ -536,11 +536,11 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
         .map(
         .map(
             obj -> {
             obj -> {
               if (obj.getProfileId().equals(tbProfileId)) {
               if (obj.getProfileId().equals(tbProfileId)) {
-                JsonNode jsonNode = null;
+                JsonNode jsonNode = JacksonUtil.newObjectNode();
                 List<ThingsModelDTO> thingsModel =
                 List<ThingsModelDTO> thingsModel =
                     thingsModelService.selectByDeviceProfileId(
                     thingsModelService.selectByDeviceProfileId(
                         FunctionTypeEnum.properties, tenantId, profileId);
                         FunctionTypeEnum.properties, tenantId, profileId);
-                if (!thingsModel.isEmpty()) {
+                if (null !=thingsModel && !thingsModel.isEmpty()) {
                   List<Map<String, Object>> attributes = new ArrayList<>();
                   List<Map<String, Object>> attributes = new ArrayList<>();
                   for (ThingsModelDTO dto : thingsModel) {
                   for (ThingsModelDTO dto : thingsModel) {
                     Map<String, Object> attribute = new HashMap<>();
                     Map<String, Object> attribute = new HashMap<>();

@@ -2,7 +2,13 @@ package org.thingsboard.server.dao.yunteng.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.thingsboard.server.dao.yunteng.entities.TkThingsModelEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkThingsModelEntity;
 
 
 @Mapper
 @Mapper
-public interface ThingsModelMapper extends BaseMapper<TkThingsModelEntity> {}
+public interface ThingsModelMapper extends BaseMapper<TkThingsModelEntity> {
+  boolean changeTSLStatus(
+      @Param("deviceProfileId") String deviceProfileId,
+      @Param("tenantId") String tenantId,
+      @Param("status") Integer status);
+}

@@ -24,4 +24,6 @@ public interface ThingsModelService {
       FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
       FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
 
 
   JsonNode getTingsModelTSL(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
   JsonNode getTingsModelTSL(FunctionTypeEnum typeEnum, String tenantId, String deviceProfileId);
+
+  boolean changeTSLStatus(String deviceProfileId,String tenantId,Integer status);
 }
 }

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.thingsboard.server.dao.yunteng.mapper.ThingsModelMapper">
+    <update id="changeTSLStatus">
+        UPDATE tk_things_model
+        SET status =#{status}
+        <where>
+            tenant_id = #{tenantId}
+            AND device_profile_id = #{deviceProfileId}
+        </where>
+    </update>
+</mapper>