fix: tk_device add column device_profile_id tk_do_action add column call_type\co…

…mmand_type\things_model_id\device_profile_id

@@ -206,7 +206,7 @@ public class YtDeviceController extends BaseController {
       @RequestParam(value = "deviceType", required = false) DeviceTypeEnum deviceType,
       @RequestParam(value = "organizationId", required = false) String organizationId,
       @RequestParam(value = "alarmStatus", required = false) Integer alarmStatus,
-      @RequestParam(value = "profileId", required = false) String profileId,
+      @RequestParam(value = "deviceProfileId", required = false) String deviceProfileId,
       @RequestParam(value = ORDER_FILED, required = false) String orderBy,
       @RequestParam(value = ORDER_TYPE, required = false) OrderTypeEnum orderType)
       throws ThingsboardException {
@@ -216,7 +216,7 @@ public class YtDeviceController extends BaseController {
     queryMap.put(ORDER_FILED, orderBy);
     queryMap.put("name", name);
     queryMap.put("alarmStatus", alarmStatus);
-    queryMap.put("profileId", profileId);
+    queryMap.put("deviceProfileId", deviceProfileId);
     if (deviceState != null) {
       if (deviceState != DeviceState.INACTIVE) {
         queryMap.put("deviceState", deviceState == DeviceState.ONLINE);
@@ -355,12 +355,14 @@ public class YtDeviceController extends BaseController {
   @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
   @ApiOperation("主设备列表")
   public List<SelectItemDTO> getMasterDevices(
-      @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId)
+      @ApiParam(value = "组织ID") @PathVariable("organizationId") String organizationId,
+      @ApiParam(value = "设备配置ID") @RequestParam(value = "deviceProfileId", required = false)
+              String deviceProfileId)
       throws ThingsboardException {
     return deviceService.findMasterDevices(
         getCurrentUser().getCurrentTenantId(),
         getCurrentUser().isCustomerUser() ? getCurrentUser().getCustomerId().toString() : null,
-        organizationId);
+        organizationId,deviceProfileId);
   }
 
   @GetMapping("/list/slave/{organizationId}")
@@ -484,16 +486,16 @@ public class YtDeviceController extends BaseController {
     return result;
   }
 
-  @GetMapping({"/attributes/{profileId}/{id}"})
+  @GetMapping({"/attributes/{deviceProfileId}/{id}"})
   @ApiOperation("获取设备的属性")
   public ResponseEntity<JsonNode> getDeviceAttributes(
-      @PathVariable("profileId") String profileId, @PathVariable("id") String id)
+      @PathVariable("deviceProfileId") String deviceProfileId, @PathVariable("id") String id)
       throws ThingsboardException {
     String tenantId = getCurrentUser().getCurrentTenantId();
-    DeviceProfileDTO dto = ytDeviceProfileService.findByTbDeviceProfileId(tenantId, profileId);
+    DeviceProfileDTO dto = ytDeviceProfileService.findDeviceProfileById(tenantId, deviceProfileId);
     if (null == dto) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    return ResponseEntity.ok(deviceService.getDeviceAttributes(profileId,dto.getId(), id, tenantId));
+    return ResponseEntity.ok(deviceService.getDeviceAttributes(deviceProfileId, id, tenantId));
   }
 }

@@ -36,9 +36,10 @@ public class DeviceDTO extends TenantDTO {
     @NotEmpty(
             message = "设备配置ID不能为空或者空字符串",
             groups = {AddGroup.class})
-    @ApiModelProperty(value = "设备配置", required = true)
+    @ApiModelProperty(value = "TB设备配置ID", required = true)
     private String profileId;
-
+    @ApiModelProperty(value = "平台设备配置ID", required = true)
+    private String deviceProfileId;
     @ApiModelProperty(value = "关联网关设备")
     private String gatewayId;
     private String gatewayName;

@@ -5,32 +5,43 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 
 import java.util.List;
 
 /**
- * @Description  场景联动执行动作数据传输表
- * @Author cxy
- * @Date 2021/11/24 17:32
+ * @Description 场景联动执行动作数据传输表 @Author cxy @Date 2021/11/24 17:32
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class DoActionDTO  extends  TenantDTO{
+public class DoActionDTO extends TenantDTO {
 
-    @ApiModelProperty(value = "所属设备id")
-    private List<String> deviceId;
-    private ScopeEnum entityType;
+  @ApiModelProperty(value = "所属设备id")
+  private List<String> deviceId;
 
+  private ScopeEnum entityType;
 
-    @ApiModelProperty(value = "场景联动内容")
-    private JsonNode doContext;
+  @ApiModelProperty(value = "场景联动内容")
+  private JsonNode doContext;
+
+  @ApiModelProperty(value = "设备配置ID")
+  private String deviceProfileId;
+
+  @ApiModelProperty(value = "调用类型：sync同步/async异步")
+  private CallTypeEnum callType;
+
+  @ApiModelProperty(value = "命令类型：0自定义 1服务")
+  private Integer commandType;
+
+  @ApiModelProperty(value = "服务模型ID")
+  private String thingsModelId;
 
   @ApiModelProperty(value = "输出目标:设备,告警,其他")
   private ActionTypeEnum outTarget;
 
-    @ApiModelProperty(value = "场景联动id")
-    private String sceneLinkageId;
+  @ApiModelProperty(value = "场景联动id")
+  private String sceneLinkageId;
 
   @ApiModelProperty(value = "输出目标为告警才进行配置")
   private String alarmProfileId;

@@ -13,12 +13,13 @@ import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName(value = ModelConstants.Table.TK_DEVICE_TABLE_NAME, autoResultMap = true)
-public class TkDevice extends TenantBaseEntity {
+public class TkDeviceEntity extends TenantBaseEntity {
     private String name;
     private String alias;
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode deviceInfo;
     private String profileId;
+    private String deviceProfileId;
     private String tbDeviceId;
     private String gatewayId;
     private String brand;

@@ -9,9 +9,9 @@ import lombok.EqualsAndHashCode;
 import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
-
 import java.util.List;
 
 /**
@@ -22,26 +22,26 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class TkDoActionEntity extends TenantBaseEntity {
 
-    private static final long serialVersionUID = -5459834451418047957L;
-
+  private static final long serialVersionUID = -5459834451418047957L;
 
-    @TableField(typeHandler = ListStringTypeHandler.class)
-    private List<String> deviceId;
+  @TableField(typeHandler = ListStringTypeHandler.class)
+  private List<String> deviceId;
 
-    @TableField(typeHandler = EnumTypeHandler.class)
-    private ScopeEnum entityType;
-    @TableField(typeHandler = EnumTypeHandler.class)
-    private ActionTypeEnum outTarget;
-    /**
-     * 场景联动内容
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JsonNode doContext;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private ScopeEnum entityType;
 
-    /**
-     * 场景联动id
-     */
-    private String sceneLinkageId;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private ActionTypeEnum outTarget;
 
-    private String alarmProfileId;
+  @TableField(typeHandler = EnumTypeHandler.class)
+  private CallTypeEnum callType;
+  private String deviceProfileId;
+  private Integer commandType;
+  private String thingsModelId;
+  /** 场景联动内容 */
+  @TableField(typeHandler = JacksonTypeHandler.class)
+  private JsonNode doContext;
+  /** 场景联动id */
+  private String sceneLinkageId;
+  private String alarmProfileId;
 }

@@ -166,25 +166,29 @@ public class ThingsModelServiceImpl
     } else {
       if (typeEnum.equals(FunctionTypeEnum.services)) {
         List<ServiceModelDTO> serviceList = new ArrayList<>();
-        for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
-          ServiceModelDTO serviceDTO = new ServiceModelDTO();
-          BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
-          JsonNode functionJson = thingsModelDTO.getFunctionJson();
-          if (null != functionJson) {
-            serviceDTO.setInputData(functionJson.get("inputData"));
-            serviceDTO.setOutputData(functionJson.get("outputData"));
+        if (!thingsModelDTOS.isEmpty()) {
+          for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
+            ServiceModelDTO serviceDTO = new ServiceModelDTO();
+            BeanUtils.copyProperties(thingsModelDTO, serviceDTO);
+            JsonNode functionJson = thingsModelDTO.getFunctionJson();
+            if (null != functionJson) {
+              serviceDTO.setInputData(functionJson.get("inputData"));
+              serviceDTO.setOutputData(functionJson.get("outputData"));
+            }
+            serviceList.add(serviceDTO);
           }
-          serviceList.add(serviceDTO);
         }
         jsonNode = JacksonUtil.convertValue(serviceList, JsonNode.class);
       } else {
         List<EventModelDTO> eventList = new ArrayList<>();
-        for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
-          EventModelDTO eventDTO = new EventModelDTO();
-          BeanUtils.copyProperties(thingsModelDTO, eventDTO);
-          JsonNode functionJson = thingsModelDTO.getFunctionJson();
-          if (null != functionJson) {
-            eventDTO.setOutputData(functionJson.get("outputData"));
+        if (!thingsModelDTOS.isEmpty()) {
+          for (ThingsModelDTO thingsModelDTO : thingsModelDTOS) {
+            EventModelDTO eventDTO = new EventModelDTO();
+            BeanUtils.copyProperties(thingsModelDTO, eventDTO);
+            JsonNode functionJson = thingsModelDTO.getFunctionJson();
+            if (null != functionJson) {
+              eventDTO.setOutputData(functionJson.get("outputData"));
+            }
           }
         }
         jsonNode = JacksonUtil.convertValue(eventList, JsonNode.class);

@@ -140,7 +140,7 @@ public class TkDeviceProfileServiceImpl
     // check if ids bind to device
     int count =
         deviceMapper.selectCount(
-            new QueryWrapper<TkDevice>().lambda().in(TkDevice::getProfileId, ids));
+            new QueryWrapper<TkDeviceEntity>().lambda().in(TkDeviceEntity::getProfileId, ids));
     if (count > 0) {
       throw new YtDataValidationException("有设备使用待删除配置，请先删除设备或者修改设备配置");
     }

@@ -39,7 +39,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDevice>
+public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDeviceEntity>
     implements TkDeviceService {
 
   private final DeviceProfileDao deviceProfileDao;
@@ -66,7 +66,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
     validateUpdate(deviceDTO);
 
-    TkDevice device = new TkDevice();
+    TkDeviceEntity device = new TkDeviceEntity();
     deviceDTO.copyToEntity(
         device,
         ModelConstants.TablePropertyMapping.ACTIVE_TIME,
@@ -109,7 +109,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
       deviceDTO.setTenantId(currentTenantId);
     } else {
       deviceTenantId = deviceDTO.getTenantId();
-      TkDevice device = baseMapper.selectById(deviceDTO.getId());
+      TkDeviceEntity device = baseMapper.selectById(deviceDTO.getId());
       if (device == null) {
         throw new YtDataValidationException("设备不存在!");
       }
@@ -126,7 +126,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     TenantId id = TenantId.fromUUID(UUID.fromString(deviceTenantId));
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
-    TkOrganizationEntity organization = ytOrganizationMapper.selectById(deviceDTO.getOrganizationId());
+    TkOrganizationEntity organization =
+        ytOrganizationMapper.selectById(deviceDTO.getOrganizationId());
     if (null == deviceProfile || null == organization) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
@@ -209,7 +210,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   private DeviceDTO insert(DeviceDTO deviceDTO) {
 
-    TkDevice device = new TkDevice();
+    TkDeviceEntity device = new TkDeviceEntity();
     deviceDTO.copyToEntity(
         device,
         ModelConstants.TablePropertyMapping.ACTIVE_TIME,
@@ -227,15 +228,15 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public List<String> findTbDeviceId(String tenantId, Set<String> ids) {
-    LambdaQueryWrapper<TkDevice> queryWrapper =
-        new QueryWrapper<TkDevice>()
+    LambdaQueryWrapper<TkDeviceEntity> queryWrapper =
+        new QueryWrapper<TkDeviceEntity>()
             .lambda()
-            .eq(TkDevice::getTenantId, tenantId)
-            .in(TkDevice::getId, ids);
+            .eq(TkDeviceEntity::getTenantId, tenantId)
+            .in(TkDeviceEntity::getId, ids);
 
     List<String> tbDeviceIds =
         baseMapper.selectList(queryWrapper).stream()
-            .map(TkDevice::getTbDeviceId)
+            .map(TkDeviceEntity::getTbDeviceId)
             .collect(Collectors.toList());
     for (String tbDeviceId : tbDeviceIds) {
       sceneNotUsed(tenantId, tbDeviceId, null);
@@ -252,10 +253,10 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     return ReflectUtils.sourceToTarget(
         baseMapper.selectList(
-            new LambdaQueryWrapper<TkDevice>()
-                .eq(deviceType != null, TkDevice::getDeviceType, deviceType)
-                .eq(deviceLabel != null, TkDevice::getLabel, deviceLabel)
-                .in(TkDevice::getOrganizationId, orgIds)),
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(deviceType != null, TkDeviceEntity::getDeviceType, deviceType)
+                .eq(deviceLabel != null, TkDeviceEntity::getLabel, deviceLabel)
+                .in(TkDeviceEntity::getOrganizationId, orgIds)),
         DeviceDTO.class);
   }
 
@@ -279,12 +280,12 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     if (StringUtils.isEmpty(deviceId) || StringUtils.isEmpty(tenantId)) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
-    TkDevice device =
+    TkDeviceEntity device =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<TkDevice>()
-                .eq(TkDevice::getTenantId, tenantId)
-                .eq(isTbDeviceId, TkDevice::getTbDeviceId, deviceId)
-                .eq(!isTbDeviceId, TkDevice::getId, deviceId));
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getTenantId, tenantId)
+                .eq(isTbDeviceId, TkDeviceEntity::getTbDeviceId, deviceId)
+                .eq(!isTbDeviceId, TkDeviceEntity::getId, deviceId));
     DeviceDTO deviceDTO = null != device ? device.getDTO(DeviceDTO.class) : null;
     if (null == deviceDTO) {
       throw new YtDataValidationException(ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
@@ -295,11 +296,11 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   @Transactional
   public void deleteDevices(String tenantId, Set<String> ids) {
-    LambdaQueryWrapper<TkDevice> queryWrapper =
-        new QueryWrapper<TkDevice>()
+    LambdaQueryWrapper<TkDeviceEntity> queryWrapper =
+        new QueryWrapper<TkDeviceEntity>()
             .lambda()
-            .eq(TkDevice::getTenantId, tenantId)
-            .in(TkDevice::getId, ids);
+            .eq(TkDeviceEntity::getTenantId, tenantId)
+            .in(TkDeviceEntity::getId, ids);
 
     baseMapper.delete(queryWrapper);
   }
@@ -317,7 +318,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
       List<String> queryOrganizationIds = organizationAllIds(tenantId, organizationId);
       queryMap.put("organizationIds", queryOrganizationIds);
     }
-    IPage<TkDevice> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
+    IPage<TkDeviceEntity> page =
+        getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME, false);
     IPage<DeviceDTO> deviceIPage = baseMapper.getDevicePage(page, queryMap);
     List<DeviceDTO> records = deviceIPage.getRecords();
     records.forEach(
@@ -352,7 +354,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
-    IPage<TkDevice> page = getPage(queryMap, "last_online_time", false);
+    IPage<TkDeviceEntity> page = getPage(queryMap, "last_online_time", false);
     IPage<RelationDeviceDTO> deviceIPage = baseMapper.getRelationDevicePage(page, queryMap);
     List<RelationDeviceDTO> records = deviceIPage.getRecords();
     return new YtPageData<>(records, deviceIPage.getTotal());
@@ -360,13 +362,13 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public boolean deviceNameUsed(String tenantId, String deviceName, String deviceId) {
-    List<TkDevice> deviceList =
+    List<TkDeviceEntity> deviceList =
         baseMapper.selectList(
-            new QueryWrapper<TkDevice>()
+            new QueryWrapper<TkDeviceEntity>()
                 .lambda()
-                .eq(true, TkDevice::getTenantId, tenantId)
-                .eq(TkDevice::getName, deviceName));
-    for (TkDevice dev : deviceList) {
+                .eq(true, TkDeviceEntity::getTenantId, tenantId)
+                .eq(TkDeviceEntity::getName, deviceName));
+    for (TkDeviceEntity dev : deviceList) {
       if (deviceName.equals(dev.getName())
           && (StringUtils.isEmpty(deviceId) || !deviceId.equals(dev.getId()))) {
         return true;
@@ -399,7 +401,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public String otherUsing(String deviceId, String tenantId) {
-    TkDevice device = baseMapper.selectById(deviceId);
+    TkDeviceEntity device = baseMapper.selectById(deviceId);
     if (device == null) {
       throw new YtDataValidationException(ErrorMessage.DEVICE_NOT_EXTIED.getMessage());
     }
@@ -411,7 +413,9 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Nullable
   private String usedBySceneLinkage(String tenantId, String tbDeviceId) {
     LambdaQueryWrapper<TkSceneLinkageEntity> sceneFilter =
-        new QueryWrapper<TkSceneLinkageEntity>().lambda().eq(TkSceneLinkageEntity::getTenantId, tenantId)
+        new QueryWrapper<TkSceneLinkageEntity>()
+            .lambda()
+            .eq(TkSceneLinkageEntity::getTenantId, tenantId)
         //                        .eq(SceneLinkage::getStatus, 1)
         ;
     Optional<List<TkSceneLinkageEntity>> scenes =
@@ -460,9 +464,9 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public List<SelectItemDTO> findMasterDevices(
-      String tenantId, String customerId, String organizationId) {
+      String tenantId, String customerId, String organizationId, String deviceProfileId) {
     List<String> orgIds = organizationAllIds(tenantId, organizationId);
-    return baseMapper.masterDevices(customerId, tenantId, orgIds);
+    return baseMapper.masterDevices(customerId, tenantId, orgIds, deviceProfileId);
   }
 
   @Override
@@ -487,10 +491,10 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   @Override
   public boolean saveSlaveDevice(
       String slaveId, String slaveName, String gatewayId, Long createTime) {
-    LambdaQueryWrapper<TkDevice> deviceFilter =
-        new QueryWrapper<TkDevice>().lambda().eq(TkDevice::getTbDeviceId, gatewayId);
-    TkDevice gateway = baseMapper.selectOne(deviceFilter);
-    TkDevice slaveDevice = new TkDevice();
+    LambdaQueryWrapper<TkDeviceEntity> deviceFilter =
+        new QueryWrapper<TkDeviceEntity>().lambda().eq(TkDeviceEntity::getTbDeviceId, gatewayId);
+    TkDeviceEntity gateway = baseMapper.selectOne(deviceFilter);
+    TkDeviceEntity slaveDevice = new TkDeviceEntity();
     slaveDevice.setName(slaveName);
     slaveDevice.setTbDeviceId(slaveId);
     slaveDevice.setSn(generateSn());
@@ -517,11 +521,11 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public DeviceDTO getSubsetDeviceByTbDeviceId(String tenantId, String tbDeviceId) {
-    TkDevice device =
+    TkDeviceEntity device =
         baseMapper.selectOne(
-            new LambdaQueryWrapper<TkDevice>()
-                .eq(TkDevice::getTbDeviceId, tbDeviceId)
-                .eq(TkDevice::getTenantId, tenantId));
+            new LambdaQueryWrapper<TkDeviceEntity>()
+                .eq(TkDeviceEntity::getTbDeviceId, tbDeviceId)
+                .eq(TkDeviceEntity::getTenantId, tenantId));
     return Optional.ofNullable(device)
         .map(obj -> obj.getDTO(DeviceDTO.class))
         .orElseThrow(
@@ -531,30 +535,26 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public JsonNode getDeviceAttributes(String tbProfileId,String profileId, String id, String tenantId) {
+  public JsonNode getDeviceAttributes(String deviceProfileId, String id, String tenantId) {
     return getDevice(tenantId, id)
         .map(
             obj -> {
-              if (obj.getProfileId().equals(tbProfileId)) {
-                JsonNode jsonNode = JacksonUtil.newObjectNode();
-                List<ThingsModelDTO> thingsModel =
-                    thingsModelService.selectByDeviceProfileId(
-                        FunctionTypeEnum.properties, tenantId, profileId);
-                if (null !=thingsModel && !thingsModel.isEmpty()) {
-                  List<Map<String, Object>> attributes = new ArrayList<>();
-                  for (ThingsModelDTO dto : thingsModel) {
-                    Map<String, Object> attribute = new HashMap<>();
-                    attribute.put("name", dto.getFunctionName());
-                    attribute.put("identifier", dto.getIdentifier());
-                    attribute.put("detail", dto.getFunctionJson());
-                    attributes.add(attribute);
-                  }
-                  jsonNode = JacksonUtil.convertValue(attributes, JsonNode.class);
+              JsonNode jsonNode = JacksonUtil.newObjectNode();
+              List<ThingsModelDTO> thingsModel =
+                  thingsModelService.selectByDeviceProfileId(
+                      FunctionTypeEnum.properties, tenantId, deviceProfileId);
+              if (null != thingsModel && !thingsModel.isEmpty()) {
+                List<Map<String, Object>> attributes = new ArrayList<>();
+                for (ThingsModelDTO dto : thingsModel) {
+                  Map<String, Object> attribute = new HashMap<>();
+                  attribute.put("name", dto.getFunctionName());
+                  attribute.put("identifier", dto.getIdentifier());
+                  attribute.put("detail", dto.getFunctionJson());
+                  attributes.add(attribute);
                 }
-                return jsonNode;
-              } else {
-                throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+                jsonNode = JacksonUtil.convertValue(attributes, JsonNode.class);
               }
+              return jsonNode;
             })
         .orElseThrow(
             () -> {

@@ -48,10 +48,10 @@ public class TkNoticeServiceImpl implements TkNoticeService {
          * 2、查找告警配置 ,与设备配置一一对应。
          * 3、查找告警通知联系人
          */
-        QueryWrapper<TkDevice> queryWrapper = new QueryWrapper<TkDevice>();
+        QueryWrapper<TkDeviceEntity> queryWrapper = new QueryWrapper<TkDeviceEntity>();
         queryWrapper.lambda()
-                .eq(TkDevice::getTbDeviceId, alarmInfo.getDeviceId());
-        TkDevice device = deviceMapper.selectOne(queryWrapper);
+                .eq(TkDeviceEntity::getTbDeviceId, alarmInfo.getDeviceId());
+        TkDeviceEntity device = deviceMapper.selectOne(queryWrapper);
 
 
         if (device == null) {

@@ -128,12 +128,12 @@ public class TkOrganizationServiceImpl extends AbstractBaseService<OrganizationM
 
     // 查询是否有设备使用该组织
     for (String id : ids) {
-      List<TkDevice> deviceList =
+      List<TkDeviceEntity> deviceList =
           deviceMapper.selectList(
-              new QueryWrapper<TkDevice>()
+              new QueryWrapper<TkDeviceEntity>()
                   .lambda()
-                  .eq(TkDevice::getTenantId, tenantId)
-                  .eq(TkDevice::getOrganizationId, id));
+                  .eq(TkDeviceEntity::getTenantId, tenantId)
+                  .eq(TkDeviceEntity::getOrganizationId, id));
       if (!deviceList.isEmpty()) {
         throw new YtDataValidationException("待删除数据存在关联设备,不能删除!");
       }

@@ -403,9 +403,9 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       }
     }
 
-    List<TkDevice> orgDevices =
+    List<TkDeviceEntity> orgDevices =
             deviceMapper.selectList(
-                    new QueryWrapper<TkDevice>().lambda().in(TkDevice::getOrganizationId, orgIds));
+                    new QueryWrapper<TkDeviceEntity>().lambda().in(TkDeviceEntity::getOrganizationId, orgIds));
     List<DeviceDTO> result =
         orgDevices.stream()
                 .filter(t -> typeFilter.isEmpty() || typeFilter.contains(t.getDeviceType()))

@@ -8,124 +8,135 @@ import org.thingsboard.server.common.data.yunteng.dto.BaseHomePageTop;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
-import org.thingsboard.server.dao.yunteng.entities.TkDevice;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 
 import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface DeviceMapper extends BaseMapper<TkDevice> {
-
-    IPage<DeviceDTO> getDevicePage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
-
-    DeviceDTO selectDetail(@Param("tenantId") String tenantId, @Param("id") String id);
-
-    /**
-     * 通过网关子设备的TB设备ID查询网关设备信息
-     *
-     * @param tbDeviceId 网关子设备的TB设备ID
-     * @return 网关设备信息
-     */
-    List<DeviceDTO> findGateWayDeviceByTbDeviceId(@Param("tbDeviceId") String tbDeviceId);
-
-    /**
-     * 更新设备告警状态
-     *
-     * @param tbDeviceId TB设备主键
-     * @param created    告警状态:0正常,1告警
-     * @return true or false
-     */
-    boolean freshAlarmStatus(
-            @Param("tbDeviceId") String tbDeviceId, @Param("created") Integer created);
-
-    /**
-     * 用于统计设备相关信息
-     *
-     * @param queryMap 查询条件
-     * @return 查询的设备信息
-     */
-    List<DeviceDTO> findDevices(@Param("queryMap") Map<String, Object> queryMap);
-
-    /**
-     * 获取关联设备的子设备分页列表
-     *
-     * @param page     分页
-     * @param queryMap 查询条件
-     * @return 分页数据
-     */
-    IPage<RelationDeviceDTO> getRelationDevicePage(
-            IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
-
-    /**
-     * 通过用户ID查询分配的所有设备ID
-     *
-     * @param customerId 用户ID
-     * @return 所有的设备ids
-     */
-    List<String> findDeviceIdsByCustomerId(@Param("customerId") String customerId);
-
-    List<BaseHomePageTop> findDeviceMessageInfo(
-            @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
-
-    List<BaseHomePageTop> findDeviceAlarmInfoByCustomer(
-            @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
-
-    Integer findDeviceMessageInfoByTs(
-            @Param("customerId") String customerId,
-            @Param("startTime") Long startTime,
-            @Param("endTime") Long endTime);
-
-    Integer findDeviceAlarmInfoByCreatedTime(
-            @Param("customerId") String customerId,
-            @Param("startTime") Long startTime,
-            @Param("endTime") Long endTime);
-
-
-    Integer countMsgs(@Param("queryMap") Map<String, Object> queryMap);
-
-    Integer countDataPoints(@Param("queryMap") Map<String, Object> queryMap);
-
-    /**
-     * 主设备列表
-     *
-     * @param customerId      客户ID
-     * @param tenantId        租户ID
-     * @param organizationIds 组织ID
-     * @return
-     */
-    List<SelectItemDTO> masterDevices(@Param("customerId") String customerId, @Param("tenantId") String tenantId, @Param("organizationIds") List<String> organizationIds);
-
-    /**
-     * 从设备列表
-     *
-     * @param customerId      客户ID
-     * @param tenantId        租户ID
-     * @param organizationIds 组织ID
-     * @param masterId        主设备ID
-     * @return
-     */
-    List<SelectItemDTO> slaveDevices(@Param("customerId") String customerId, @Param("tenantId") String tenantId
-            , @Param("organizationIds") List<String> organizationIds, @Param("masterId") String masterId);
-
-    /**
-     * TCP协议传输时，获取网关设备的从设备
-     * @param tenantId   租户ID
-     * @param masterId   网关设备的TB_ID
-     * @param code       网关子设备的标识符，例如：485协议的从设备地址码
-     * @return
-     */
-    DeviceDTO slaveDevice(@Param("tenantId") String tenantId, @Param("masterId") String masterId, @Param("code") String code);
-    /**
-     * 设备遥测数据指标名称
-     *
-     * @param tenantId       租户ID
-     * @param customerId     客户ID
-     * @param organizationIds 组织ID
-     * @param deviceIds      设备ID
-     * @return
-     */
-    List<String> findDeviceKeys(@Param("tenantId") String tenantId
-            , @Param("customerId") String customerId
-            , @Param("organizationIds") List<String>  organizationIds
-            , @Param("deviceIds") List<String> deviceIds);
+public interface DeviceMapper extends BaseMapper<TkDeviceEntity> {
+
+  IPage<DeviceDTO> getDevicePage(IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  DeviceDTO selectDetail(@Param("tenantId") String tenantId, @Param("id") String id);
+
+  /**
+   * 通过网关子设备的TB设备ID查询网关设备信息
+   *
+   * @param tbDeviceId 网关子设备的TB设备ID
+   * @return 网关设备信息
+   */
+  List<DeviceDTO> findGateWayDeviceByTbDeviceId(@Param("tbDeviceId") String tbDeviceId);
+
+  /**
+   * 更新设备告警状态
+   *
+   * @param tbDeviceId TB设备主键
+   * @param created 告警状态:0正常,1告警
+   * @return true or false
+   */
+  boolean freshAlarmStatus(
+      @Param("tbDeviceId") String tbDeviceId, @Param("created") Integer created);
+
+  /**
+   * 用于统计设备相关信息
+   *
+   * @param queryMap 查询条件
+   * @return 查询的设备信息
+   */
+  List<DeviceDTO> findDevices(@Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 获取关联设备的子设备分页列表
+   *
+   * @param page 分页
+   * @param queryMap 查询条件
+   * @return 分页数据
+   */
+  IPage<RelationDeviceDTO> getRelationDevicePage(
+      IPage<?> page, @Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 通过用户ID查询分配的所有设备ID
+   *
+   * @param customerId 用户ID
+   * @return 所有的设备ids
+   */
+  List<String> findDeviceIdsByCustomerId(@Param("customerId") String customerId);
+
+  List<BaseHomePageTop> findDeviceMessageInfo(
+      @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+
+  List<BaseHomePageTop> findDeviceAlarmInfoByCustomer(
+      @Param("todayTime") Long todayTime, @Param("customerId") String customerId);
+
+  Integer findDeviceMessageInfoByTs(
+      @Param("customerId") String customerId,
+      @Param("startTime") Long startTime,
+      @Param("endTime") Long endTime);
+
+  Integer findDeviceAlarmInfoByCreatedTime(
+      @Param("customerId") String customerId,
+      @Param("startTime") Long startTime,
+      @Param("endTime") Long endTime);
+
+  Integer countMsgs(@Param("queryMap") Map<String, Object> queryMap);
+
+  Integer countDataPoints(@Param("queryMap") Map<String, Object> queryMap);
+
+  /**
+   * 主设备列表
+   *
+   * @param customerId 客户ID
+   * @param tenantId 租户ID
+   * @param organizationIds 组织ID
+   * @return
+   */
+  List<SelectItemDTO> masterDevices(
+      @Param("customerId") String customerId,
+      @Param("tenantId") String tenantId,
+      @Param("organizationIds") List<String> organizationIds,
+      @Param("deviceProfileId") String deviceProfileId);
+
+  /**
+   * 从设备列表
+   *
+   * @param customerId 客户ID
+   * @param tenantId 租户ID
+   * @param organizationIds 组织ID
+   * @param masterId 主设备ID
+   * @return
+   */
+  List<SelectItemDTO> slaveDevices(
+      @Param("customerId") String customerId,
+      @Param("tenantId") String tenantId,
+      @Param("organizationIds") List<String> organizationIds,
+      @Param("masterId") String masterId);
+
+  /**
+   * TCP协议传输时，获取网关设备的从设备
+   *
+   * @param tenantId 租户ID
+   * @param masterId 网关设备的TB_ID
+   * @param code 网关子设备的标识符，例如：485协议的从设备地址码
+   * @return
+   */
+  DeviceDTO slaveDevice(
+      @Param("tenantId") String tenantId,
+      @Param("masterId") String masterId,
+      @Param("code") String code);
+  /**
+   * 设备遥测数据指标名称
+   *
+   * @param tenantId 租户ID
+   * @param customerId 客户ID
+   * @param organizationIds 组织ID
+   * @param deviceIds 设备ID
+   * @return
+   */
+  List<String> findDeviceKeys(
+      @Param("tenantId") String tenantId,
+      @Param("customerId") String customerId,
+      @Param("organizationIds") List<String> organizationIds,
+      @Param("deviceIds") List<String> deviceIds);
 }

@@ -7,176 +7,182 @@ import org.thingsboard.server.common.data.yunteng.dto.RelationDeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.SelectItemDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.dao.yunteng.entities.TkDevice;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 
-public interface TkDeviceService extends BaseService<TkDevice> {
-    DeviceDTO insertOrUpdate(String tenantId, DeviceDTO deviceDTO);
-
-    void deleteDevices(String tenantId, Set<String> ids);
-
-    Optional<DeviceDTO> getDevice(String tenantId, String id);
-
-    YtPageData<DeviceDTO> page(String tenantId, Map<String, Object> queryMap);
-
-    YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap);
-
-    /**
-     * 验证表单数据有效性
-     *
-     * @param ytDevice
-     */
-    void validateFormData(String currentTenantId, DeviceDTO ytDevice);
-
-    /**
-     * 查询所有的设备信息
-     *
-     * @param deviceDTO 过滤参数
-     * @return List<DeviceDTO>
-     */
-  boolean deviceNameUsed(String tenantId, String deviceName,String deviceId);
-
-    List<String> findTbDeviceId(String tenantId, Set<String> ids);
-
-    /**
-     * 通过设备类型和组织ID查询所有的设备
-     *
-     * @param deviceType     设备类型
-     * @param organizationId 组织ID
-     * @return 设备列表
-     */
-    List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
-            DeviceTypeEnum deviceType, String tenantId, String organizationId,String deviceLabel);
-
-    /**
-     * 通过设备ID和租户ID判断该设备是否存在
-     *
-     * @param tenantId 租户ID
-     * @param deviceId 设备ID
-     * @return 设备
-     */
-    DeviceDTO checkDeviceByTenantIdAndDeviceId(String tenantId, String deviceId);
-
-    /**
-     * 通过网关子设备的TB设备ID查询网关设备信息
-     *
-     * @param tbDeviceId 网关子设备的TB设备ID
-     * @param tenantId   租户ID
-     * @return 网关设备信息
-     */
-    List<DeviceDTO> findGateWayDeviceByTbDeviceId(String tenantId, String tbDeviceId);
-
-    /**
-     * 通过设备ID和租户ID检查设备是否存在
-     *
-     * @param tenantId     租户ID
-     * @param deviceId     设备ID
-     * @param isTbDeviceId 是TB设备ID
-     * @return 设备信息
-     */
-    DeviceDTO checkDeviceByTenantIdAndId(String tenantId, String deviceId, boolean isTbDeviceId);
-
-    /**
-     * 更新设备告警状态
-     *
-     * @param tbDeviceId TB设备主键
-     * @param created    告警状态:0正常,1告警
-     * @return
-     */
-    boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
-
-
-    /**
-     * 自动生成设备SN
-     *
-     * @return
-     */
-    String generateSn();
-
-    /**
-     *
-     * 设备是否被其它资源使用，例如：场景联动
-     * @param deviceId  平台设备ID
-     * @param tenantId  租户ID
-     * @return
-     */
-    String otherUsing(String deviceId,String tenantId);
-
-    /**
-     * 主设备信息
-     * @param tenantId        租户ID
-     * @param organizationId  组织ID
-     * @return   设备列表
-     */
-    List<SelectItemDTO> findMasterDevices(String tenantId, String customerId, String organizationId);
-
-    /**
-     * 从设备信息
-     * @param masterId        主设备ID
-     * @param tenantId        租户ID
-     * @param organizationId  组织ID
-     * @return   设备列表
-     */
-    List<SelectItemDTO> findSlaveDevices(String masterId,String tenantId,String customerId, String organizationId);
-
-
-    /**
-     * TCP协议传输时，获取网关设备的从设备
-     * @param tenantId   租户ID
-     * @param masterId   网关设备的TB_ID
-     * @param deviceCode       网关子设备的标识符，例如：485协议的从设备地址码
-     * @return
-     */
-    DeviceDTO findSlaveDevice(String tenantId,String masterId,String deviceCode);
-
-    /**
-     * 设备遥测数据指标名称
-     * @param tenantId         租户ID
-     * @param customerId       客户ID
-     * @param organizationId   组织ID
-     * @param deviceIds        设备ID
-     * @return
-     */
-    List<String> findDeviceKeys(String tenantId,String customerId, String organizationId,List<String> deviceIds);
-
-
-    /**
-     * Thingsboard自动创建的传感器设备(网关子设备)同步到平台
-     * @param slaveId    网关子设备TB平台的ID
-     * @param slaveName  网关子设备TB平台的名称
-     * @param gatewayId  网关设备TB平台的ID
-     * @return
-     */
-    boolean saveSlaveDevice(String slaveId, String slaveName, String gatewayId, Long createTime);
-
-    /**
-     * 通过设备ids查询拥有数值型属性的设备
-     * @param tenantId 租户ID
-     * @param ids
-     * @return 数值型设备列表
-     */
-    List<DeviceDTO> findNumberAttributeDevicesByIds(String tenantId,List<String> ids);
-
-    /**
-     * 通过tb设备ID获取平台设备信息
-     * @param tenantId 租户ID
-     * @param tbDeviceId tb设备ID
-     * @return 设备信息
-     */
-    DeviceDTO getSubsetDeviceByTbDeviceId(String tenantId,String tbDeviceId);
-
-    /**
-     * 通过设备ID 设备配置ID获取属性
-     * @param tbProfileId tb设备配置ID
-     * @param profileId 设备配置ID
-     * @param id 设备ID
-     * @param tenantId 租户ID
-     * @return 属性信息
-     */
-    JsonNode getDeviceAttributes(String tbProfileId,String profileId,String id,String tenantId);
-
+public interface TkDeviceService extends BaseService<TkDeviceEntity> {
+  DeviceDTO insertOrUpdate(String tenantId, DeviceDTO deviceDTO);
+
+  void deleteDevices(String tenantId, Set<String> ids);
+
+  Optional<DeviceDTO> getDevice(String tenantId, String id);
+
+  YtPageData<DeviceDTO> page(String tenantId, Map<String, Object> queryMap);
+
+  YtPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap);
+
+  /**
+   * 验证表单数据有效性
+   *
+   * @param ytDevice
+   */
+  void validateFormData(String currentTenantId, DeviceDTO ytDevice);
+
+  /**
+   * 查询所有的设备信息
+   *
+   * @param deviceDTO 过滤参数
+   * @return List<DeviceDTO>
+   */
+  boolean deviceNameUsed(String tenantId, String deviceName, String deviceId);
+
+  List<String> findTbDeviceId(String tenantId, Set<String> ids);
+
+  /**
+   * 通过设备类型和组织ID查询所有的设备
+   *
+   * @param deviceType 设备类型
+   * @param organizationId 组织ID
+   * @return 设备列表
+   */
+  List<DeviceDTO> findDevicesByDeviceTypeAndOrganizationId(
+      DeviceTypeEnum deviceType, String tenantId, String organizationId, String deviceLabel);
+
+  /**
+   * 通过设备ID和租户ID判断该设备是否存在
+   *
+   * @param tenantId 租户ID
+   * @param deviceId 设备ID
+   * @return 设备
+   */
+  DeviceDTO checkDeviceByTenantIdAndDeviceId(String tenantId, String deviceId);
+
+  /**
+   * 通过网关子设备的TB设备ID查询网关设备信息
+   *
+   * @param tbDeviceId 网关子设备的TB设备ID
+   * @param tenantId 租户ID
+   * @return 网关设备信息
+   */
+  List<DeviceDTO> findGateWayDeviceByTbDeviceId(String tenantId, String tbDeviceId);
+
+  /**
+   * 通过设备ID和租户ID检查设备是否存在
+   *
+   * @param tenantId 租户ID
+   * @param deviceId 设备ID
+   * @param isTbDeviceId 是TB设备ID
+   * @return 设备信息
+   */
+  DeviceDTO checkDeviceByTenantIdAndId(String tenantId, String deviceId, boolean isTbDeviceId);
+
+  /**
+   * 更新设备告警状态
+   *
+   * @param tbDeviceId TB设备主键
+   * @param created 告警状态:0正常,1告警
+   * @return
+   */
+  boolean freshAlarmStatus(EntityId tbDeviceId, Integer created);
+
+  /**
+   * 自动生成设备SN
+   *
+   * @return
+   */
+  String generateSn();
+
+  /**
+   * 设备是否被其它资源使用，例如：场景联动
+   *
+   * @param deviceId 平台设备ID
+   * @param tenantId 租户ID
+   * @return
+   */
+  String otherUsing(String deviceId, String tenantId);
+
+  /**
+   * 主设备信息
+   *
+   * @param tenantId 租户ID
+   * @param organizationId 组织ID
+   * @return 设备列表
+   */
+  List<SelectItemDTO> findMasterDevices(
+      String tenantId, String customerId, String organizationId, String deviceProfileId);
+
+  /**
+   * 从设备信息
+   *
+   * @param masterId 主设备ID
+   * @param tenantId 租户ID
+   * @param organizationId 组织ID
+   * @return 设备列表
+   */
+  List<SelectItemDTO> findSlaveDevices(
+      String masterId, String tenantId, String customerId, String organizationId);
+
+  /**
+   * TCP协议传输时，获取网关设备的从设备
+   *
+   * @param tenantId 租户ID
+   * @param masterId 网关设备的TB_ID
+   * @param deviceCode 网关子设备的标识符，例如：485协议的从设备地址码
+   * @return
+   */
+  DeviceDTO findSlaveDevice(String tenantId, String masterId, String deviceCode);
+
+  /**
+   * 设备遥测数据指标名称
+   *
+   * @param tenantId 租户ID
+   * @param customerId 客户ID
+   * @param organizationId 组织ID
+   * @param deviceIds 设备ID
+   * @return
+   */
+  List<String> findDeviceKeys(
+      String tenantId, String customerId, String organizationId, List<String> deviceIds);
+
+  /**
+   * Thingsboard自动创建的传感器设备(网关子设备)同步到平台
+   *
+   * @param slaveId 网关子设备TB平台的ID
+   * @param slaveName 网关子设备TB平台的名称
+   * @param gatewayId 网关设备TB平台的ID
+   * @return
+   */
+  boolean saveSlaveDevice(String slaveId, String slaveName, String gatewayId, Long createTime);
+
+  /**
+   * 通过设备ids查询拥有数值型属性的设备
+   *
+   * @param tenantId 租户ID
+   * @param ids
+   * @return 数值型设备列表
+   */
+  List<DeviceDTO> findNumberAttributeDevicesByIds(String tenantId, List<String> ids);
+
+  /**
+   * 通过tb设备ID获取平台设备信息
+   *
+   * @param tenantId 租户ID
+   * @param tbDeviceId tb设备ID
+   * @return 设备信息
+   */
+  DeviceDTO getSubsetDeviceByTbDeviceId(String tenantId, String tbDeviceId);
+
+  /**
+   * 通过设备ID 设备配置ID获取属性
+   *
+   * @param deviceProfileId 平台设备配置ID
+   * @param id 设备ID
+   * @param tenantId 租户ID
+   * @return 属性信息de
+   */
+  JsonNode getDeviceAttributes(String deviceProfileId, String id, String tenantId);
 }

@@ -14,6 +14,7 @@
         <result property="deviceInfo" column="device_info"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="profileId" column="profile_id"/>
+        <result property="deviceProfileId" column="device_profile_id"/>
         <result property="activeTime" column="active_time"/>
         <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="brand" column="brand" />
@@ -63,7 +64,7 @@
 
     <sql id="basicColumns">
         ifd.id
-        ,ifd.sn,ifd.brand,ifd.name,ifd.alias,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description
+        ,ifd.sn,ifd.brand,ifd.name,ifd.alias,ifd.device_info,ifd.profile_id,ifd.device_profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ifd.updater,ifd.organization_id,ifd.alarm_status
     </sql>
@@ -93,8 +94,8 @@
             <if test="queryMap.tenantId !=null and queryMap.tenantId !=''">
                 AND ifd.tenant_id = #{queryMap.tenantId}
             </if>
-            <if test="queryMap.profileId !=null and queryMap.profileId !=''">
-                AND ifd.profile_id = #{queryMap.profileId}
+            <if test="queryMap.deviceProfileId !=null and queryMap.deviceProfileId !=''">
+                AND ifd.device_profile_id = #{queryMap.deviceProfileId}
             </if>
             <if test="queryMap.name !=null and queryMap.name !=''">
                 AND (
@@ -338,6 +339,9 @@
             <if test="tenantId !=null and tenantId !=''">
                 AND base.tenant_id = #{tenantId}
             </if>
+            <if test="deviceProfileId !=null and deviceProfileId !=''">
+                AND base.device_profile_id = #{deviceProfileId}
+            </if>
             <if test="customerId !=null and customerId !=''">
                 AND tde.customer_id :: TEXT = #{customerId}
             </if>

@@ -8,19 +8,25 @@
         <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="doContext" column="do_context" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
         <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
-        <result property="sceneLinkageId" column="scene_linkage_id"/>
+        <result property="callType" column="call_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="commandType" column="command_type"/>
+        <result property="thingsModelId" column="scene_linkage_id"/>
+        <result property="sceneLinkageId" column="things_model_id"/>
+        <result property="deviceProfileId" column="device_profile_id"/>
         <result property="alarmProfileId" column="alarm_profile_id"/>
-        <result property="description" column="description"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="updater" column="updater"/>
         <result property="updateTime" column="update_time"/>
         <result property="createTime" column="create_time"/>
         <result property="creator" column="creator"/>
-
+        
     </resultMap>
-
+    <sql id="columns">
+        id,device_id,entity_type,do_context,out_target,call_type,scene_linkage_id,alarm_profile_id,
+        tenant_id,updater,update_time,create_time,creator,command_type,things_model_id,device_profile_id
+    </sql>
     <select id="listBySceneId" resultMap="actionDTO">
-        SELECT *   FROM tk_do_action WHERE scene_linkage_id  = #{sceneId}
+        SELECT <include refid="columns"/>  FROM tk_do_action WHERE scene_linkage_id  = #{sceneId}
     </select>
 
 </mapper>