Merge branch 'master_dev' into 'master'

Master dev

See merge request yunteng/thingskit!314

@@ -24,10 +24,7 @@ import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 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.core.exception.TkDataValidationException;
 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.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-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.TkThingsModel;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 import org.thingsboard.server.common.data.yunteng.dto.thingsmodel.ImportThingsModelDTO;
 import org.thingsboard.server.common.data.yunteng.dto.thingsmodel.ImportThingsModelDTO;
 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.ImportEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ImportEnum;
@@ -44,6 +41,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.ORDER_TYPE;
@@ -367,4 +365,16 @@ public class ThingsModelController extends BaseController {
       return null;
       return null;
     }
     }
   }
   }
+
+  @PostMapping("/batch/get_tsl")
+  @ApiOperation("获取多个产品的物模型数据")
+  public ResponseEntity<List<BatchDeviceProfileInfoDTO>> getDeviceProfilesTSL(@RequestBody DeviceProfileTSLDTO profileTSLDTO)
+          throws ThingsboardException {
+    if(null == profileTSLDTO.getDeviceProfileIds() || null == profileTSLDTO.getFunctionTypeEnum() ||
+    profileTSLDTO.getDeviceProfileIds().isEmpty()){
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    return ResponseEntity.ok(thingsModelService.getDeviceProfileTSLInfoByIds(getCurrentUser().getCurrentTenantId(),
+            profileTSLDTO.getDeviceProfileIds(),profileTSLDTO.getFunctionTypeEnum()));
+  }
 }
 }

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

+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.DeviceTypeEnum;
+
+@Data
+public class BatchDeviceProfileInfoDTO {
+
+    @ApiModelProperty(value = "产品ID/设备配置ID")
+    private String id;
+    @ApiModelProperty(value = "产品名称/设备配置名称")
+    private String name;
+    @ApiModelProperty(value = "传输协议")
+    private String transportType;
+    @ApiModelProperty(value = "产品类型：GATEWAY,DIRECT_CONNECTION,SENSOR")
+    private DeviceTypeEnum deviceType;
+    @ApiModelProperty(value = "物模型TSL")
+    private JsonNode tsl;
+}

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.enums.FunctionTypeEnum;
+
+import java.util.List;
+
+@Data
+public class DeviceProfileTSLDTO {
+
+    @ApiModelProperty(value = "产品id列表", required = true)
+    private List<String> deviceProfileIds;
+
+    @ApiModelProperty(value = "查询的物模型类型", required = true)
+    private FunctionTypeEnum functionTypeEnum;
+}

@@ -188,7 +188,7 @@ 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(!typeEnum.equals(FunctionTypeEnum.all),TkThingsModelEntity::getFunctionType, typeEnum)
                 .eq(TkThingsModelEntity::getStatus, StatusEnum.ENABLE.getIndex()));
                 .eq(TkThingsModelEntity::getStatus, StatusEnum.ENABLE.getIndex()));
     if (entityList.isEmpty()) {
     if (entityList.isEmpty()) {
       return null;
       return null;
@@ -267,11 +267,12 @@ public class ThingsModelServiceImpl
       for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
       for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
         JsonNode functionJson = thingsModelDTO.getFunctionJson();
         JsonNode functionJson = thingsModelDTO.getFunctionJson();
         if (null != functionJson) {
         if (null != functionJson) {
-          switch (typeEnum) {
+          switch (thingsModelDTO.getFunctionType()) {
             case properties:
             case properties:
               AttributeModelDTO attributeModelDTO = new AttributeModelDTO();
               AttributeModelDTO attributeModelDTO = new AttributeModelDTO();
               BeanUtils.copyProperties(thingsModelDTO, attributeModelDTO);
               BeanUtils.copyProperties(thingsModelDTO, attributeModelDTO);
               attributeModelDTO.setSpecs(functionJson);
               attributeModelDTO.setSpecs(functionJson);
+              attributeModelDTO.setFunctionType(FunctionTypeEnum.properties);
               serviceList.add(attributeModelDTO);
               serviceList.add(attributeModelDTO);
               break;
               break;
             case services:
             case services:
@@ -279,12 +280,14 @@ public class ThingsModelServiceImpl
               BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
               BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
               serviceDTO.setInputData(functionJson.get(inputData));
               serviceDTO.setInputData(functionJson.get(inputData));
               serviceDTO.setOutputData(functionJson.get(outputData));
               serviceDTO.setOutputData(functionJson.get(outputData));
+              serviceDTO.setFunctionType(FunctionTypeEnum.services);
               serviceList.add(serviceDTO);
               serviceList.add(serviceDTO);
               break;
               break;
             case events:
             case events:
               EventModelDTO eventDTO = new EventModelDTO();
               EventModelDTO eventDTO = new EventModelDTO();
               BeanUtils.copyProperties(thingsModelDTO, eventDTO);
               BeanUtils.copyProperties(thingsModelDTO, eventDTO);
               eventDTO.setOutputData(functionJson.get(outputData));
               eventDTO.setOutputData(functionJson.get(outputData));
+              eventDTO.setFunctionType(FunctionTypeEnum.events);
               serviceList.add(eventDTO);
               serviceList.add(eventDTO);
               break;
               break;
             default:
             default:
@@ -440,6 +443,30 @@ public class ThingsModelServiceImpl
     }
     }
     return true;
     return true;
   }
   }
+
+  @Override
+  public List<BatchDeviceProfileInfoDTO> getDeviceProfileTSLInfoByIds(String tenantId, List<String> deviceProfileIds, FunctionTypeEnum functionTypeEnum) {
+    List<BatchDeviceProfileInfoDTO> list = new ArrayList<>();
+    if(null != deviceProfileIds && !deviceProfileIds.isEmpty()){
+      deviceProfileIds.stream().forEach(deviceProfileId->{
+        BatchDeviceProfileInfoDTO batchDeviceProfileInfo  = new BatchDeviceProfileInfoDTO();
+        DeviceProfileDTO deviceProfileDTO = tkDeviceProfileService.getDeviceProfile(tenantId,deviceProfileId);
+        if(null != deviceProfileDTO){
+          batchDeviceProfileInfo.setId(deviceProfileId);
+          batchDeviceProfileInfo.setName(deviceProfileDTO.getName());
+          batchDeviceProfileInfo.setDeviceType(deviceProfileDTO.getDeviceType());
+          batchDeviceProfileInfo.setTransportType(deviceProfileDTO.getTransportType());
+          JsonNode tsl = getTingsModelTSL(functionTypeEnum,tenantId,deviceProfileId);
+          if(null != tsl && tsl.isArray()){
+            batchDeviceProfileInfo.setTsl(tsl);
+          }
+          list.add(batchDeviceProfileInfo);
+        }
+      });
+    }
+    return list;
+  }
+
   private void checkNameAndIdentifier(
   private void checkNameAndIdentifier(
       List<String> existIdentifiers,
       List<String> existIdentifiers,
       FunctionTypeEnum functionType,
       FunctionTypeEnum functionType,

@@ -74,9 +74,11 @@ public class TkVideoServiceImpl extends AbstractBaseService<TkVideoMapper, TkVid
                         videoDTO.getId()));
                         videoDTO.getId()));
             }
             }
             TkVideoPlatformEntity platform  = tkVideoPlatformMapper.selectById(videoDTO.getVideoPlatformId());
             TkVideoPlatformEntity platform  = tkVideoPlatformMapper.selectById(videoDTO.getVideoPlatformId());
-            String  paramKey = videoDTO.getParams()==null?"":(videoDTO.getParams().get("channelNo")==null?"":
-                    "&channelNo="+videoDTO.getParams().get("channelNo").intValue());
-            VideoUrlUtils.clearVideoUrlData(platform.getAppKey()+videoDTO.getSn()+paramKey);
+            if(platform!=null){
+                String  paramKey = videoDTO.getParams()==null?"":(videoDTO.getParams().get("channelNo")==null?"":
+                        "&channelNo="+videoDTO.getParams().get("channelNo").intValue());
+                VideoUrlUtils.clearVideoUrlData(platform.getAppKey()+videoDTO.getSn()+paramKey);
+            }
             baseMapper.updateById(videoDTO.getEntity(TkVideoEntity.class));
             baseMapper.updateById(videoDTO.getEntity(TkVideoEntity.class));
         } else {
         } else {
             baseMapper.insert(videoDTO.getEntity(TkVideoEntity.class));
             baseMapper.insert(videoDTO.getEntity(TkVideoEntity.class));

 package org.thingsboard.server.dao.yunteng.service;
 package org.thingsboard.server.dao.yunteng.service;
 
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.yunteng.dto.BatchDeviceProfileInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 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.dto.TkThingsModel;
 import org.thingsboard.server.common.data.yunteng.dto.TkThingsModel;
@@ -50,8 +51,14 @@ public interface ThingsModelService extends BaseService<TkThingsModelEntity>{
 
 
   boolean getByIdentifier(String tenantId, String deviceProfileId,String categoryId,String identifier);
   boolean getByIdentifier(String tenantId, String deviceProfileId,String categoryId,String identifier);
 
 
-
-
-
+  /**
+   * 获取对应产品列表的物模型信息
+   * @param tenantId 租户ID
+   * @param deviceProfileIds 产品列表
+   * @param functionTypeEnum
+   * @return
+   */
+  List<BatchDeviceProfileInfoDTO> getDeviceProfileTSLInfoByIds(String tenantId, List<String> deviceProfileIds,
+                                                               FunctionTypeEnum functionTypeEnum);
 
 
 }
 }