Merge branch 'master' into 20230222

@@ -576,7 +576,7 @@ public class DefaultTransportService implements TransportService {
     @Override
     public void process(TransportProtos.SessionInfoProto sessionInfo, TransportProtos.PostEventMsg msg,
                         TransportServiceCallback<Void> callback,String topicName) {
-        //Topic地址：v1/devices/event/${deviceId}/${identifier}/{$eventType}
+        //Topic地址：v1/devices/event/${deviceId}/${identifier}
         String[] topicInfo = topicName.split(MqttTopics.BASE_DEVICE_EVENT_TOPIC + "/");
         if(null == topicInfo || topicInfo.length !=2){
             throw new TkDataValidationException(ErrorMessage.INVALID_TOPIC.getMessage());
@@ -597,7 +597,6 @@ public class DefaultTransportService implements TransportService {
         metaData.putValue("device_profile_id", deviceProfileId.toString());
         metaData.putValue("deviceId",eventInfo[0]);
         metaData.putValue("event_identifier", eventInfo[1]);
-        metaData.putValue("event_type",eventInfo[2]);
         sendToRuleEngine(tenantId, deviceId, customerId, sessionInfo, json, metaData, SessionMsgType.POST_EVENT_REQUEST,
                 new TransportTbQueueCallback(new ApiStatsProxyCallback<>(tenantId, customerId, msg.getKvList().size(), callback)));
     }

@@ -3,7 +3,6 @@ package org.thingsboard.server.dao.yunteng.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -13,8 +12,6 @@ import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
-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.FunctionTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.StatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
@@ -159,45 +156,41 @@ public class ThingsModelServiceImpl
     }
     List<ThingsModelDTO> thingsModelDTOS =
         selectByDeviceProfileId(typeEnum, tenantId, deviceProfileId);
-    if(null ==thingsModelDTOS){
+    if (null == thingsModelDTOS) {
       return jsonNode;
     }
-    DeviceTypeEnum deviceType = deviceProfileDTO.getDeviceType();
-    if (typeEnum.equals(FunctionTypeEnum.properties)) {
-      jsonNode = getAttributeTSL(thingsModelDTOS, deviceType);
-    } else {
-      if (typeEnum.equals(FunctionTypeEnum.services)) {
-        List<ServiceModelDTO> serviceList = new ArrayList<>();
-        if (!thingsModelDTOS.isEmpty()) {
-          for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
-            ServiceModelDTO serviceDTO = new ServiceModelDTO();
-            BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
-            JsonNode functionJson = thingsModelDTO.getFunctionJson();
-            if (null != functionJson) {
+    List<Object> serviceList = new ArrayList<>();
+    if (!thingsModelDTOS.isEmpty()) {
+      for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
+        JsonNode functionJson = thingsModelDTO.getFunctionJson();
+        if (null != functionJson) {
+          switch (typeEnum) {
+            case properties:
+              AttributeModelDTO attributeModelDTO = new AttributeModelDTO();
+              BeanUtils.copyProperties(thingsModelDTO, attributeModelDTO);
+              attributeModelDTO.setSpecs(functionJson.get("dataType"));
+              serviceList.add(attributeModelDTO);
+              break;
+            case services:
+              ServiceModelDTO serviceDTO = new ServiceModelDTO();
+              BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
               serviceDTO.setInputData(functionJson.get("inputData"));
               serviceDTO.setOutputData(functionJson.get("outputData"));
-            }
-            serviceList.add(serviceDTO);
-          }
-        }
-        jsonNode = JacksonUtil.convertValue(serviceList, JsonNode.class);
-      } else {
-        List<EventModelDTO> eventList = new ArrayList<>();
-        if (!thingsModelDTOS.isEmpty()) {
-          for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
-            EventModelDTO eventDTO = new EventModelDTO();
-            BeanUtils.copyProperties(thingsModelDTO, eventDTO);
-            JsonNode functionJson = thingsModelDTO.getFunctionJson();
-            if (null != functionJson) {
+              serviceList.add(serviceDTO);
+              break;
+            case events:
+              EventModelDTO eventDTO = new EventModelDTO();
+              BeanUtils.copyProperties(thingsModelDTO, eventDTO);
               eventDTO.setOutputData(functionJson.get("outputData"));
-            }
+              serviceList.add(eventDTO);
+              break;
+            default:
+              break;
           }
         }
-        jsonNode = JacksonUtil.convertValue(eventList, JsonNode.class);
       }
     }
-
-    return jsonNode;
+    return JacksonUtil.convertValue(serviceList, JsonNode.class);
   }
 
   @Override
@@ -206,53 +199,6 @@ public class ThingsModelServiceImpl
     return baseMapper.changeTSLStatus(deviceProfileId, tenantId, status);
   }
 
-  private JsonNode getAttributeTSL(
-      List<ThingsModelDTO> thingsModelDTOS, DeviceTypeEnum deviceType) {
-    Map<String, List<ObjectNode>> attributeMap = new HashMap<>();
-    JsonNode jsonNode;
-    List<ObjectNode> list = new ArrayList<>();
-    for (ThingsModelDTO model : thingsModelDTOS) {
-      ObjectNode objectNode = JacksonUtil.newObjectNode();
-      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);
-    }
-    if (deviceType.equals(DeviceTypeEnum.SENSOR)) {
-      attributeMap.put("网关子设备名称", list);
-      jsonNode = JacksonUtil.convertValue(attributeMap, JsonNode.class);
-    } else {
-      jsonNode = JacksonUtil.convertValue(list, JsonNode.class);
-    }
-
-    return jsonNode;
-  }
-
   private boolean checkIdentifier(
       String deviceProfileId, String identifier, boolean isAdd, String thingsModelId) {
     TkThingsModelEntity entity =