refactor: 迁移代码

1.合并设备管理
2.合并设备配置

@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.controller;
 
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
@@ -186,62 +187,6 @@ public class DeviceProfileController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "Create Or Update Device Profile (saveDeviceProfile)",
-            notes = "Create or update the Device Profile. When creating device profile, platform generates device profile id as " + UUID_WIKI_LINK +
-                    "The newly created device profile id will be present in the response. " +
-                    "Specify existing device profile id to update the device profile. " +
-                    "Referencing non-existing device profile Id will cause 'Not Found' error. " + NEW_LINE +
-                    "Device profile name is unique in the scope of tenant. Only one 'default' device profile may exist in scope of tenant." + DEVICE_PROFILE_DATA +
-                    TENANT_AUTHORITY_PARAGRAPH,
-            produces = "application/json",
-            consumes = "application/json")
-    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
-    @RequestMapping(value = "/deviceProfile", method = RequestMethod.POST)
-    @ResponseBody
-    public DeviceProfile saveDeviceProfile(
-            @ApiParam(value = "A JSON value representing the device profile.")
-            @RequestBody DeviceProfile deviceProfile) throws ThingsboardException {
-        try {
-            boolean created = deviceProfile.getId() == null;
-            deviceProfile.setTenantId(getTenantId());
-
-            checkEntity(deviceProfile.getId(), deviceProfile, Resource.DEVICE_PROFILE);
-
-            boolean isFirmwareChanged = false;
-            boolean isSoftwareChanged = false;
-
-            if (!created) {
-                DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
-                if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
-                    isFirmwareChanged = true;
-                }
-                if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
-                    isSoftwareChanged = true;
-                }
-            }
-
-            DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
-
-            tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
-            tbClusterService.broadcastEntityStateChangeEvent(deviceProfile.getTenantId(), savedDeviceProfile.getId(),
-                    created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
-
-            logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile,
-                    null,
-                    created ? ActionType.ADDED : ActionType.UPDATED, null);
-
-            otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
-
-            sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),
-                    deviceProfile.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
-            return savedDeviceProfile;
-        } catch (Exception e) {
-            logEntityAction(emptyId(EntityType.DEVICE_PROFILE), deviceProfile,
-                    null, deviceProfile.getId() == null ? ActionType.ADDED : ActionType.UPDATED, e);
-            throw handleException(e);
-        }
-    }
-
     @ApiOperation(value = "Delete device profile (deleteDeviceProfile)",
             notes = "Deletes the device profile. Referencing non-existing device profile Id will cause an error. " +
                     "Can't delete the device profile if it is referenced by existing devices." + TENANT_AUTHORITY_PARAGRAPH,
@@ -337,6 +282,62 @@ public class DeviceProfileController extends BaseController {
         }
     }
 
+    @ApiOperation(value = "Create Or Update Device Profile (saveDeviceProfile)",
+            notes = "Create or update the Device Profile. When creating device profile, platform generates device profile id as " + UUID_WIKI_LINK +
+                    "The newly created device profile id will be present in the response. " +
+                    "Specify existing device profile id to update the device profile. " +
+                    "Referencing non-existing device profile Id will cause 'Not Found' error. " + NEW_LINE +
+                    "Device profile name is unique in the scope of tenant. Only one 'default' device profile may exist in scope of tenant." + DEVICE_PROFILE_DATA +
+                    TENANT_AUTHORITY_PARAGRAPH,
+            produces = "application/json",
+            consumes = "application/json")
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/deviceProfile", method = RequestMethod.POST)
+    @ResponseBody
+    public DeviceProfile saveDeviceProfile(
+            @ApiParam(value = "A JSON value representing the device profile.")
+            @RequestBody DeviceProfile deviceProfile) throws ThingsboardException {
+        try {
+            boolean created = deviceProfile.getId() == null;
+            deviceProfile.setTenantId(getTenantId());
+
+            checkEntity(deviceProfile.getId(), deviceProfile, Resource.DEVICE_PROFILE);
+
+            boolean isFirmwareChanged = false;
+            boolean isSoftwareChanged = false;
+
+            if (!created) {
+                DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
+                if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
+                    isFirmwareChanged = true;
+                }
+                if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
+                    isSoftwareChanged = true;
+                }
+            }
+
+            DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
+
+            tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
+            tbClusterService.broadcastEntityStateChangeEvent(deviceProfile.getTenantId(), savedDeviceProfile.getId(),
+                    created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+
+            logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile,
+                    null,
+                    created ? ActionType.ADDED : ActionType.UPDATED, null);
+
+            otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
+
+            sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),
+                    deviceProfile.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+            return savedDeviceProfile;
+        } catch (Exception e) {
+            logEntityAction(emptyId(EntityType.DEVICE_PROFILE), deviceProfile,
+                    null, deviceProfile.getId() == null ? ActionType.ADDED : ActionType.UPDATED, e);
+            throw handleException(e);
+        }
+    }
+
     @ApiOperation(value = "Get Device Profiles for transport type (getDeviceProfileInfos)",
             notes = "Returns a page of devices profile info objects owned by tenant. " +
                     PAGE_DATA_PARAMETERS + DEVICE_PROFILE_INFO_DESCRIPTION + TENANT_OR_CUSTOMER_AUTHORITY_PARAGRAPH,

-package org.thingsboard.server.controller.yunteng;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import org.thingsboard.server.common.data.exception.ThingsboardException;
-import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.controller.BaseController;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmProfileService;
-
-@RestController
-@RequestMapping("/api/yt/alarmProfile")
-@RequiredArgsConstructor
-public class YtAlarmProfileController extends BaseController {
-  private final YtAlarmProfileService alarmProfileService;
-
-  @PostMapping
-  public ResponseEntity<AlarmProfileDTO> saveAlarmProfile(
-      @RequestBody AlarmProfileDTO alarmProfileDTO) throws ThingsboardException {
-    return ResponseEntity.ok(alarmProfileService.saveOrUpdateAlarmProfile(getCurrentUser().getCurrentTenantId(), alarmProfileDTO));
-  }
-
-  @DeleteMapping
-  public ResponseEntity<Boolean> deleteAlarmProfile(
-          @RequestBody DeleteDTO deleteDTO) {
-    return ResponseEntity.ok(alarmProfileService.deleteAlarmProfile(deleteDTO.getIds()));
-  }
-}

@@ -16,10 +16,10 @@ import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
-import org.thingsboard.server.common.data.yunteng.core.exception.FastIotException;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.enums.DeviceState;
@@ -35,6 +35,7 @@ import org.thingsboard.server.service.security.permission.Resource;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -51,13 +52,26 @@ public class YtDeviceController extends BaseController {
 
   @PostMapping
   public ResponseEntity<DeviceDTO> saveDevice(@Validated(AddGroup.class)@RequestBody DeviceDTO deviceDTO)
-          throws FastIotException, ThingsboardException {
+          throws ThingsboardException {
      boolean enable = deviceService.validateFormdata(deviceDTO);
      if(!enable){
        ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
      }
 
     Device tbDevice = buildTbDeviceFromDeviceDTO(getCurrentUser().getTenantId(),deviceDTO);
+    Device savedDevice = updateTbDevice(tbDevice,deviceDTO.getDeviceToken());
+
+    deviceDTO.setTbDeviceId(savedDevice.getId().getId().toString());
+    DeviceDTO newDeviceDTO = deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
+    return Optional.ofNullable(newDeviceDTO)
+        .map(
+            dto -> {
+              return ResponseEntity.ok(newDeviceDTO);
+            })
+        .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+  }
+
+  private Device updateTbDevice( Device tbDevice,String deviceToken) throws ThingsboardException {
     Device oldDevice = null;
     boolean created = tbDevice.getId() == null;
     if (!created) {
@@ -66,7 +80,7 @@ public class YtDeviceController extends BaseController {
       checkEntity(null, tbDevice, Resource.DEVICE);
     }
 
-    Device savedDevice = checkNotNull(tbDeviceService.saveDeviceWithAccessToken(tbDevice, deviceDTO.getDeviceToken()));
+    Device savedDevice = checkNotNull(tbDeviceService.saveDeviceWithAccessToken(tbDevice, deviceToken));
     tbClusterService.onDeviceUpdated(savedDevice, oldDevice);
     try {
       logEntityAction(getCurrentUser(), savedDevice.getId(), savedDevice,
@@ -75,15 +89,7 @@ public class YtDeviceController extends BaseController {
     } catch (ThingsboardException e) {
       log.error("Failed to log entity action", e);
     }
-
-    deviceDTO.setTbDeviceId(savedDevice.getId().getId().toString());
-    DeviceDTO newDeviceDTO = deviceService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceDTO);
-    return Optional.ofNullable(newDeviceDTO)
-        .map(
-            dto -> {
-              return ResponseEntity.ok(newDeviceDTO);
-            })
-        .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
+    return savedDevice;
   }
 
   @GetMapping("{id}")
@@ -123,7 +129,29 @@ public class YtDeviceController extends BaseController {
 
   @DeleteMapping
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
-    deviceService.deleteDevices(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+    String currentTenantId = getCurrentUser().getCurrentTenantId();
+    List<String> tdIds = deviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());
+    for(String id:tdIds){
+      deleteTbDevice(id);
+    }
+    deviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
+  }
+
+  private void deleteTbDevice(String id) throws ThingsboardException {
+    DeviceId deviceId = new DeviceId(toUUID(id));
+    Device device = checkDeviceId(deviceId, Operation.DELETE);
+
+    List<EdgeId> relatedEdgeIds = findRelatedEdgeIds(getTenantId(), deviceId);
+
+    tbDeviceService.deleteDevice(getCurrentUser().getTenantId(), deviceId);
+
+    tbClusterService.onDeviceDeleted(device, null);
+
+    logEntityAction(deviceId, device,
+            device.getCustomerId(),
+            ActionType.DELETED, null, id);
+
+    sendDeleteNotificationMsg(getTenantId(), deviceId, relatedEdgeIds);
   }
 
 
@@ -146,7 +174,8 @@ public class YtDeviceController extends BaseController {
     additionalInfo.put("overwriteActivityTime",false);
 
 
-    DeviceProfileId deviceProfileId = new DeviceProfileId(UUID.fromString(deviceDTO.getProfileId()));
+
+    DeviceProfileId deviceProfileId = new DeviceProfileId(UUID.fromString(deviceDTO.getDeviceProfile().getTbProfileId()));
 
 
     tbDevice.setAdditionalInfo(additionalInfo);

 package org.thingsboard.server.controller.yunteng;
 
+import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceProfileProvisionType;
+import org.thingsboard.server.common.data.DeviceProfileType;
+import org.thingsboard.server.common.data.DeviceTransportType;
+import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.device.profile.*;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 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.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.common.msg.queue.ServiceQueue;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
+import org.thingsboard.server.service.security.permission.Operation;
 
 import java.net.URI;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.*;
 
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
 
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("api/yt/deviceProfile")
+@Api(tags = {"设备配置"})
 public class YtDeviceProfileController extends BaseController {
-  private final YtDeviceProfileService deviceProfileService;
+  private final YtDeviceProfileService ytDeviceProfileService;
 
   @PostMapping
-  @PreAuthorize("hasRole('ROLE_TENANT_ADMIN')")
+  @PreAuthorize("hasAnyAuthority('TENANT_ADMIN')")
   public ResponseEntity<DeviceProfileDTO> saveDeviceProfile(
       @RequestBody DeviceProfileDTO deviceProfileDTO) throws ThingsboardException {
-    DeviceProfileDTO newDeviceProfileDTO = deviceProfileService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceProfileDTO);
+
+    boolean created = deviceProfileDTO.getId() == null;
+
+    /**
+     * 业务流程
+     * 1/3.验证业务平台中表单数据的合法性
+     * 2/3.处理TB业务逻辑
+     * 3/3.处理业务平台的业务逻辑
+     */
+    //TODO  1/3.验证业务平台中表单数据的合法性
+
+    //TODO  2/3.处理TB业务逻辑
+    deviceProfileDTO.setTenantId(getCurrentUser().getCurrentTenantId());
+    DeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(deviceProfileDTO);
+    DeviceProfile savedDeviceProfile = updateTbDeviceProfile(tbDeviceProfile,created);
+
+
+    //TODO  3/3.处理业务平台的业务逻辑
+
+    DeviceProfileDTO newDeviceProfileDTO = ytDeviceProfileService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceProfileDTO);
     return Optional.ofNullable(newDeviceProfileDTO)
         .map(
             dto -> {
@@ -47,9 +82,45 @@ public class YtDeviceProfileController extends BaseController {
         .orElse(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build());
   }
 
+  /**
+   * 更新thingsboard的设备配置信息
+   * @param deviceProfile   设备配置
+   * @param created         新建设备
+   * @throws ThingsboardException
+   */
+  private DeviceProfile updateTbDeviceProfile(DeviceProfile deviceProfile,boolean created) throws ThingsboardException {
+    boolean isFirmwareChanged = false;
+    boolean isSoftwareChanged = false;
+    if (!created) {
+      DeviceProfile oldDeviceProfile = deviceProfileService.findDeviceProfileById(getTenantId(), deviceProfile.getId());
+      if (!Objects.equals(deviceProfile.getFirmwareId(), oldDeviceProfile.getFirmwareId())) {
+        isFirmwareChanged = true;
+      }
+      if (!Objects.equals(deviceProfile.getSoftwareId(), oldDeviceProfile.getSoftwareId())) {
+        isSoftwareChanged = true;
+      }
+    }
+
+    DeviceProfile savedDeviceProfile = checkNotNull(deviceProfileService.saveDeviceProfile(deviceProfile));
+
+    tbClusterService.onDeviceProfileChange(savedDeviceProfile, null);
+    tbClusterService.broadcastEntityStateChangeEvent(deviceProfile.getTenantId(), savedDeviceProfile.getId(),
+            created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+
+    logEntityAction(savedDeviceProfile.getId(), savedDeviceProfile,
+            null,
+            created ? ActionType.ADDED : ActionType.UPDATED, null);
+
+    otaPackageStateService.update(savedDeviceProfile, isFirmwareChanged, isSoftwareChanged);
+
+    sendEntityNotificationMsg(getTenantId(), savedDeviceProfile.getId(),
+            deviceProfile.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
+    return savedDeviceProfile;
+  }
+
   @GetMapping("{id}")
   public ResponseEntity<DeviceProfileDTO> getDevice(@PathVariable("id") String id) throws ThingsboardException {
-    return ResponseEntity.of(deviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
+    return ResponseEntity.of(ytDeviceProfileService.getDeviceProfile(getCurrentUser().getCurrentTenantId(), id));
   }
 
   @GetMapping(params = {PAGE_SIZE, PAGE})
@@ -69,18 +140,72 @@ public class YtDeviceProfileController extends BaseController {
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
-    return deviceProfileService.page(getCurrentUser().getCurrentTenantId(), queryMap);
+    return ytDeviceProfileService.page(getCurrentUser().getCurrentTenantId(), queryMap);
   }
 
   @DeleteMapping
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO) throws ThingsboardException {
-    deviceProfileService.deleteDeviceProfiles(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+    for(String id:deleteDTO.getIds()){
+      deleteTbDeviceProfile(id);
+    }
+    ytDeviceProfileService.deleteDeviceProfiles(getCurrentUser().getCurrentTenantId(), deleteDTO.getIds());
+  }
+
+  private void deleteTbDeviceProfile(String strDeviceProfileId) throws ThingsboardException {
+    DeviceProfileId deviceProfileId = new DeviceProfileId(toUUID(strDeviceProfileId));
+    DeviceProfile deviceProfile = checkDeviceProfileId(deviceProfileId, Operation.DELETE);
+    deviceProfileService.deleteDeviceProfile(getTenantId(), deviceProfileId);
+
+    tbClusterService.onDeviceProfileDelete(deviceProfile, null);
+    tbClusterService.broadcastEntityStateChangeEvent(deviceProfile.getTenantId(), deviceProfile.getId(), ComponentLifecycleEvent.DELETED);
+
+    logEntityAction(deviceProfileId, deviceProfile,
+            null,
+            ActionType.DELETED, null, deviceProfileId);
+
+    sendEntityNotificationMsg(getTenantId(), deviceProfile.getId(), EdgeEventActionType.DELETED);
   }
 
   @GetMapping("/me")
   public ResponseEntity<List<DeviceProfileDTO>> findCurrentTenantDeviceProfiles() throws ThingsboardException {
-    DeviceProfileDTO deviceProfileDTO = new DeviceProfileDTO();
-    deviceProfileDTO.setTenantId(getCurrentUser().getCurrentTenantId());
-    return ResponseEntity.ok(deviceProfileService.findDeviceProfile(getCurrentUser().getCurrentTenantId(), deviceProfileDTO));
+
+    return ResponseEntity.ok(ytDeviceProfileService.findDeviceProfile(getCurrentUser().getCurrentTenantId()));
+  }
+
+  /**
+   * 构造调用TBDeviceProfile需要的参数
+   *
+   * @param deviceProfileDTO 页面接收的参数
+   * @return 封装好的TBDeviceProfile
+   */
+  private DeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(DeviceProfileDTO deviceProfileDTO) {
+    DeviceProfile tbDeviceProfile = new DeviceProfile();
+    if (StringUtils.isNotBlank(deviceProfileDTO.getId())) {
+      UUID profileId = UUID.fromString(deviceProfileDTO.getId());
+      tbDeviceProfile.setId(new DeviceProfileId(profileId));
+    }
+    tbDeviceProfile.setName(deviceProfileDTO.getName());
+    tbDeviceProfile.setType(DeviceProfileType.DEFAULT);
+    UUID tenantId = UUID.fromString(deviceProfileDTO.getTenantId());
+    tbDeviceProfile.setTenantId(new TenantId(tenantId));
+    // 传输类型默认都是Default
+    tbDeviceProfile.setTransportType(DeviceTransportType.DEFAULT);
+    // 获取当前租户的默认规则链
+//    tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(getCurrentUserDefaultRuleChains()));
+    tbDeviceProfile.setDefaultQueueName(ServiceQueue.MAIN);
+    tbDeviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
+    tbDeviceProfile.setCreatedTime(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+    DeviceProfileData deviceProfileData = new DeviceProfileData();
+    deviceProfileData.setConfiguration(new DefaultDeviceProfileConfiguration());
+    deviceProfileData.setProvisionConfiguration(new DisabledDeviceProfileProvisionConfiguration(null));
+    deviceProfileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration());
+    if (null != deviceProfileDTO.getAlarms()) {
+      List<DeviceProfileAlarm> list = new ArrayList<>();
+      DeviceProfileAlarm deviceProfileAlarm =  JacksonUtil.convertValue(deviceProfileDTO.getAlarms(),DeviceProfileAlarm.class);
+      list.add(deviceProfileAlarm);
+      deviceProfileData.setAlarms(list);
+    }
+    tbDeviceProfile.setProfileData(deviceProfileData);
+    return tbDeviceProfile;
   }
 }

@@ -43,7 +43,7 @@ public class DeviceProfileInfo extends EntityInfo {
 
     @JsonCreator
     public DeviceProfileInfo(@JsonProperty("id") EntityId id,
-                             @JsonProperty("name") String name,
+                             @JsonProperty("name") String name ,
                              @JsonProperty("image") String image,
                              @JsonProperty("defaultDashboardId") DashboardId defaultDashboardId,
                              @JsonProperty("type") DeviceProfileType type,

@@ -25,6 +25,7 @@ public class DeviceProfileDTO extends TenantDTO {
   @NotEmpty(message = "传输协议不能为空或者二空字符串")
   private DeviceTransportType transportType;
   /** TB的设备配置文件 */
+  @Deprecated
   private String tbProfileId;
 
   private JsonNode alarms;

+package org.thingsboard.server.dao.yunteng.entities;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName(ModelConstants.DEVICE_PROFILE_COLUMN_FAMILY_NAME)
+public class YtDeviceProfile extends TenantBaseEntity {
+  private String name;
+  private String description;
+  /** 转换脚本：TCP才会使用 */
+  @Deprecated
+  private String convertJs;
+
+  private TransportTypeEnum transportType;
+  /** TB的设备配置文件 */
+  @TableField(updateStrategy = FieldStrategy.IGNORED)
+  private String tbProfileId;
+}

-package org.thingsboard.server.dao.yunteng.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
-import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
-import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
-import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
-import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
-import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
-import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmProfileService;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-@Service
-@RequiredArgsConstructor
-@Slf4j
-public class YtAlarmProfileServiceImpl extends AbstractBaseService<AlarmProfileMapper, AlarmProfile>
-    implements YtAlarmProfileService {
-
-  @Override
-  @Transactional
-  public AlarmProfileDTO saveOrUpdateAlarmProfile(String tenantId,AlarmProfileDTO alarmProfileDTO) {
-    AlarmProfile alarmProfile = new AlarmProfile();
-    alarmProfileDTO.copyToEntity(alarmProfile);
-    if (StringUtils.isEmpty(alarmProfileDTO.getId())) {
-      alarmProfile.setTenantId(tenantId);
-      baseMapper.insert(alarmProfile);
-    } else {
-      baseMapper.updateById(alarmProfile);
-    }
-    alarmProfile.copyToDTO(alarmProfileDTO);
-    return alarmProfileDTO;
-  }
-
-  @Override
-  @Transactional
-  public boolean deleteAlarmProfile(Set<String> ids) {
-    return baseMapper.deleteBatchIds(ids) > 0;
-  }
-
-  @Override
-  public AlarmProfileDTO findAlarmProfileByDeviceProfileId(String tenantId,String deviceProfileId) {
-    if (StringUtils.isEmpty(deviceProfileId)) {
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
-    List<AlarmProfile> alarmProfileList =
-        baseMapper.selectList(
-            new QueryWrapper<AlarmProfile>()
-                .lambda()
-                .eq(AlarmProfile::getDeviceProfileId, deviceProfileId)
-                .eq(AlarmProfile::getTenantId, tenantId));
-    return Optional.ofNullable(alarmProfileList)
-        .filter(alarmProfiles -> alarmProfiles.size() > 0)
-        .map(
-            alarmProfiles ->
-                ReflectUtils.sourceToTarget(alarmProfileList, AlarmProfileDTO.class).get(0))
-        .orElse(null);
-  }
-}

@@ -28,7 +28,7 @@ public class YtCommonServiceImpl implements YtCommonService {
     DeviceDTO deviceDTO = new DeviceDTO();
     deviceDTO.setDeviceToken(deviceToken);
     //检查数据库是否已存在对应的DeviceToken
-    if(deviceService.findDeviceInfo(tenantId,deviceDTO).size()>0){
+    if(deviceService.findTbDeviceId(tenantId,deviceDTO).size()>0){
       generateDeviceToken(tenantId);
     }
     return deviceToken;

 package org.thingsboard.server.dao.yunteng.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -15,12 +21,14 @@ import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.enums.TransportTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
+import org.thingsboard.server.dao.device.DeviceProfileDao;
+import org.thingsboard.server.dao.yunteng.entities.AlarmProfile;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
 import org.thingsboard.server.dao.yunteng.entities.YtDeviceProfile;
+import org.thingsboard.server.dao.yunteng.mapper.AlarmProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceProfileMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
-import org.thingsboard.server.dao.yunteng.service.YtAlarmProfileService;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceProfileService;
 
 import java.util.*;
@@ -29,13 +37,15 @@ import java.util.*;
 @RequiredArgsConstructor
 @Slf4j
 public class YtDeviceProfileServiceImpl
-    extends AbstractBaseService<DeviceProfileMapper, org.thingsboard.server.dao.yunteng.entities.YtDeviceProfile>
-    implements YtDeviceProfileService {
+        extends AbstractBaseService<DeviceProfileMapper, YtDeviceProfile>
+        implements YtDeviceProfileService {
 
   private final DeviceMapper deviceMapper;
-  private final YtAlarmProfileService alarmProfileService;
+  private final AlarmProfileMapper alarmProfileMapper;
   private final CacheUtils cacheUtils;
 
+  private final DeviceProfileDao deviceProfileDao;
+
   @Override
   @Transactional
   public DeviceProfileDTO insertOrUpdate(String tenantId,DeviceProfileDTO deviceProfileDTO) {
@@ -47,40 +57,80 @@ public class YtDeviceProfileServiceImpl
   }
 
   private DeviceProfileDTO update(String tenantId,DeviceProfileDTO deviceProfileDTO) {
-    YtDeviceProfile deviceProfile = baseMapper.selectById(deviceProfileDTO.getId());
-    if (!deviceProfile.getTenantId().equals(tenantId)) {
-      return null;
-    }
-    deviceProfileDTO.copyToEntity(deviceProfile);
+
     // 如果原来不是TCP或者更新也不是TCP 那就需要check
-    if (!deviceProfile.getTransportType().equals(TransportTypeEnum.TCP)
-        || !deviceProfileDTO.getTransportType().equals(TransportTypeEnum.TCP)) {
-      checkDeviceProfile(deviceProfileDTO, deviceProfile);
+//    if (!deviceProfile.getTransportType().equals(TransportTypeEnum.TCP)
+//        || !deviceProfileDTO.getTransportType().equals(TransportTypeEnum.TCP)) {
+//      checkDeviceProfile(deviceProfileDTO, deviceProfile);
+//    }
+    LambdaQueryWrapper<AlarmProfile> filter = new QueryWrapper<AlarmProfile>().lambda()
+            .eq(AlarmProfile::getTenantId,deviceProfileDTO.getTenantId())
+            .eq(AlarmProfile::getDeviceProfileId,deviceProfileDTO.getId());
+    List<AlarmProfile> oldAlarms = alarmProfileMapper.selectList(filter);
+    List<String> oldIds = new ArrayList<>();
+    for(AlarmProfile item: oldAlarms){
+      oldIds.add(item.getId());
     }
-    baseMapper.updateById(deviceProfile);
+
+
+
     Optional.ofNullable(deviceProfileDTO.getAlarmProfile())
-        .filter(alarmProfileDTO -> StringUtils.isNotBlank(alarmProfileDTO.getId()))
-        .map(alarmProfileDTO -> alarmProfileService.saveOrUpdateAlarmProfile(tenantId,alarmProfileDTO));
-    return deviceProfile.getDTO(DeviceProfileDTO.class);
+//        .filter(alarmProfileDTO -> StringUtils.isNotBlank(alarmProfileDTO.getId()))
+        .ifPresent(alarmProfileDTO -> {
+          AlarmProfile alarmProfile = buildAlarmDto2Entity(deviceProfileDTO.getId(), deviceProfileDTO.getTenantId(), alarmProfileDTO);
+          String alarmId = alarmProfileDTO.getId();
+          if(StringUtils.isNotBlank(alarmId)){
+            alarmProfileMapper.updateById(alarmProfile);
+            oldIds.remove(alarmId);
+          }{
+            alarmProfileMapper.insert(alarmProfile);
+          }
+        });
+    Optional.ofNullable(oldIds).ifPresent(item->alarmProfileMapper.deleteBatchIds(item));
+    return deviceProfileDTO;
   }
 
-  private DeviceProfileDTO insert(String tenantId,DeviceProfileDTO deviceProfileDTO) {
-    YtDeviceProfile deviceProfile = new YtDeviceProfile();
-    // 判断数据库是否已存在名字相同的设备配置
-    if (findDeviceProfile(tenantId,deviceProfileDTO).size() > 0) {
-      throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
-    }
-    deviceProfileDTO.copyToEntity(deviceProfile);
-    deviceProfile.setTenantId(tenantId);
-    saveOrUpdateTBDeviceProfile(deviceProfileDTO, deviceProfile);
-    baseMapper.insert(deviceProfile);
+  private DeviceProfileDTO insert(String deviceProfileId,DeviceProfileDTO deviceProfileDTO) {
     Optional.ofNullable(deviceProfileDTO.getAlarmProfile())
         .map(
             alarmProfileDTO -> {
-              alarmProfileDTO.setDeviceProfileId(deviceProfile.getId());
-              return alarmProfileService.saveOrUpdateAlarmProfile(tenantId,alarmProfileDTO);
+              AlarmProfile alarmProfile = buildAlarmDto2Entity(deviceProfileId, deviceProfileDTO.getTenantId(), alarmProfileDTO);
+              alarmProfileMapper.insert(alarmProfile);
+              alarmProfile.copyToDTO(alarmProfileDTO);
+              return alarmProfileDTO;
             });
-    return deviceProfile.getDTO(DeviceProfileDTO.class);
+    return deviceProfileDTO;
+  }
+
+  @NotNull
+  private AlarmProfile buildAlarmDto2Entity(String deviceProfileId, String tenantId, AlarmProfileDTO alarmProfileDTO) {
+    alarmProfileDTO.setDeviceProfileId(deviceProfileId);
+    alarmProfileDTO.setTenantId(tenantId);
+    AlarmProfile alarmProfile = new AlarmProfile();
+    alarmProfileDTO.copyToEntity(alarmProfile, ModelConstants.TablePropertyMapping.UPDATE_TIME,
+            ModelConstants.TablePropertyMapping.UPDATER);
+    return alarmProfile;
+  }
+
+  @Override
+  public boolean validateFormdata(DeviceProfileDTO ytDeviceProfileDTO) {
+    TenantId tenantId = new TenantId(UUID.fromString(ytDeviceProfileDTO.getTenantId()));
+    if(StringUtils.isBlank(ytDeviceProfileDTO.getId())){
+      // 判断数据库是否已存在名字相同的设备配置
+
+      DeviceProfile profile = deviceProfileDao.findByName(tenantId, ytDeviceProfileDTO.getName());
+      if (profile != null) {
+        throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+      }
+    }else{
+      UUID profileId = UUID.fromString(ytDeviceProfileDTO.getId());
+      DeviceProfile profile = deviceProfileDao.findById(tenantId, profileId);
+      if (profile == null) {
+        throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+      }
+    }
+
+    return false;
   }
 
   @Override
@@ -93,43 +143,29 @@ public class YtDeviceProfileServiceImpl
       throw new YtDataValidationException("有设备使用待删除配置，请先删除设备或者修改设备配置");
     }
     // TODO check if ids bind to iotfs_key_value_mapping
-    // 删除本地时,先删除TB的DeviceProfile
-    for (String id : ids) {
-      YtDeviceProfile deviceProfile = baseMapper.selectById(id);
-//        if (!tbConnectService.deleteDeviceProfile(deviceProfile.getTbProfileId()).get()) {
-//          log.error("delete TBProfile error {}", deviceProfile.getTbProfileId());
-//          throw new FastIotException(ErrorMessage.INVALID_PARAMETER);
-//        }
-      // 删除设备配置同时需要删除对应的告警配置
-      AlarmProfileDTO alarmProfileDTO = alarmProfileService.findAlarmProfileByDeviceProfileId(tenantId,id);
-      Optional.ofNullable(alarmProfileDTO)
-          .filter(alarm -> StringUtils.isNotBlank(alarm.getId()))
-          .map(
-              alarm -> {
-                Set<String> alarmList = new HashSet<>();
-                alarmList.add(alarm.getId());
-                return alarmProfileService.deleteAlarmProfile(alarmList);
-              });
+    List<UUID> deletedIds = new ArrayList<>();
+    for(String id:ids){
+      deletedIds.add(UUID.fromString(id));
+      LambdaQueryWrapper filter = new QueryWrapper<AlarmProfile>()
+              .lambda()
+              .eq(AlarmProfile::getTenantId, tenantId)
+              .in(AlarmProfile::getDeviceProfileId, id);
+      alarmProfileMapper.delete(filter);
     }
-    baseMapper.delete(
-        new QueryWrapper<YtDeviceProfile>()
-            .lambda()
-            .eq(YtDeviceProfile::getTenantId, tenantId)
-            .in(YtDeviceProfile::getId, ids));
+    deviceProfileDao.removeAllByIds(deletedIds);
+
   }
 
   @Override
   public Optional<DeviceProfileDTO> getDeviceProfile(String tenantId,String id) {
-    return Optional.ofNullable(
-            baseMapper.selectOne(
-                new QueryWrapper<YtDeviceProfile>()
-                    .lambda()
-                    .eq(
-                        YtDeviceProfile::getTenantId,
-                        tenantId)
-                    .eq(YtDeviceProfile::getId, id)))
-        .map(deviceProfile -> deviceProfile.getDTO(DeviceProfileDTO.class));
-  }
+    TenantId tenant = new TenantId(UUID.fromString(tenantId));
+    DeviceProfile profile = deviceProfileDao.findById(tenant,UUID.fromString(id));
+    return Optional.ofNullable(profile).map(entity ->{
+      DeviceProfileDTO result = new DeviceProfileDTO();
+      BeanUtils.copyProperties(entity,result);
+      return result;
+    });
+   }
 
   @Override
   public PageData<DeviceProfileDTO> page(String tenantId,Map<String, Object> queryMap) {
@@ -156,139 +192,20 @@ public class YtDeviceProfileServiceImpl
     return getPageData(deviceIPage, DeviceProfileDTO.class);
   }
 
-  @Override
-  public List<DeviceProfileDTO> findDeviceProfile(String tenantId,DeviceProfileDTO deviceProfileDTO) {
-    List<YtDeviceProfile> deviceProfileList =
-        baseMapper.selectList(
-            new QueryWrapper<YtDeviceProfile>()
-                .lambda()
-                .eq(YtDeviceProfile::getTenantId, tenantId)
-                .like(
-                    StringUtils.isNotBlank(deviceProfileDTO.getName()),
-                    YtDeviceProfile::getName,
-                    deviceProfileDTO.getName()));
-    return ReflectUtils.sourceToTarget(deviceProfileList, DeviceProfileDTO.class);
-  }
 
-  /**
-   * 构造调用TBDeviceProfile需要的参数
-   *
-   * @param deviceProfileDTO 页面接收的参数
-   * @return 封装好的TBDeviceProfile
 
-  private TBDeviceProfile buildTbDeviceProfileFromDeviceProfileDTO(
-      DeviceProfileDTO deviceProfileDTO) {
-    TBDeviceProfile tbDeviceProfile = new TBDeviceProfile();
-    if (StringUtils.isNotBlank(deviceProfileDTO.getId())) {
-      List<DeviceProfileDTO> deviceProfile = baseMapper.getDeviceProfileInfo(deviceProfileDTO);
-      tbDeviceProfile.setId(
-          new Id(EntityType.DEVICE_PROFILE, deviceProfile.get(0).getTbProfileId()));
-    }
-    tbDeviceProfile.setName(deviceProfileDTO.getName());
-    // 传输类型默认都是Default
-    tbDeviceProfile.setTransportType(TransportTypeEnum.DEFAULT.name());
-    // 获取当前租户的默认规则链
-    tbDeviceProfile.setDefaultRuleChainId(
-        new Id(EntityType.RULE_CHAIN, getCurrentUserDefaultRuleChains()));
-    tbDeviceProfile.setDefaultQueueName(TbConnectConstant.RuleEngine.MAIN);
-    tbDeviceProfile.setProvisionType(ProvisionTypeEnum.DISABLED.name());
-    tbDeviceProfile.setCreatedTime(
-        LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
-    TBDeviceProfile.DeviceProfileData deviceProfileData = new TBDeviceProfile.DeviceProfileData();
-    deviceProfileData.setConfiguration(new TBDeviceProfile.DeviceProfileConfiguration());
-    deviceProfileData.setProvisionConfiguration(
-        new TBDeviceProfile.DeviceProfileProvisionConfiguration());
-    deviceProfileData.setTransportConfiguration(
-        new TBDeviceProfile.DeviceProfileTransportConfiguration());
-    if (null != deviceProfileDTO.getAlarms()) {
-      List<TBDeviceProfile.DeviceProfileAlarm> list = new ArrayList<>();
-      TBDeviceProfile.DeviceProfileAlarm deviceProfileAlarm =  JacksonUtil.convertValue(deviceProfileDTO.getAlarms(),TBDeviceProfile.DeviceProfileAlarm.class);
-      list.add(deviceProfileAlarm);
-      deviceProfileData.setAlarms(list);
-    }
-    tbDeviceProfile.setProfileData(deviceProfileData);
-    return tbDeviceProfile;
-  }   */
 
-  /**
-   * 检查设备配置然后进行相应的操作
-   *
-   * @param target 用户新选择的配置
-   * @param source 用户以前选择的配置
-   */
-  private void checkDeviceProfile(DeviceProfileDTO target, YtDeviceProfile source) {
-    // 原来是TCP => Default、MQTT或其他 需要新增TB设备配置文件
-    if (source.getTransportType().equals(TransportTypeEnum.TCP)
-        && !target.getTransportType().equals(TransportTypeEnum.TCP)) {
-      saveOrUpdateTBDeviceProfile(target, source);
-    }
-    if (!source.getTransportType().equals(TransportTypeEnum.TCP)) {
-      // 原来不是TCP => 更新值或者更换TB设备配置文件
-      if (!target.getTransportType().equals(TransportTypeEnum.TCP)) {
-        // 目标不是TCP则进行修改名称
-        saveOrUpdateTBDeviceProfile(target, source);
-      } else {
-        // 目标是TCP则删除原来的TBDeviceProfile
-//        tbConnectService.deleteDeviceProfile(source.getTbProfileId());
-        source.setTbProfileId(null);
-      }
-    }
-  }
 
-  /**
-   * 调用TB保存设备配置
-   *
-   * @param target 用户新选择的配置
-   * @param source 用户以前选择的配置
-   */
-  private void saveOrUpdateTBDeviceProfile(DeviceProfileDTO target, YtDeviceProfile source) {
-//    if (tbConfig.isEnabled()) {
-//      try {
-//        TBDeviceProfile tbDeviceProfile = buildTbDeviceProfileFromDeviceProfileDTO(target);
-//        tbDeviceProfile = tbConnectService.saveOrUpdateDeviceProfile(tbDeviceProfile).get();
-//        if (null == tbDeviceProfile) {
-//          throw new FastIotException(ErrorMessage.INVALID_PARAMETER);
-//        }
-//        source.setTbProfileId(tbDeviceProfile.getId().getId());
-//      } catch (ExecutionException | InterruptedException e) {
-//        log.error("create TBDeviceProfile error {}", e.getMessage());
-//        throw new FastIotException(ErrorMessage.CONNECT_TO_TB_ERROR);
-//      }
-//    }
-  }
 
-  private String getCurrentUserDefaultRuleChains() {
-    String defaultId;
-//    Optional<String> result =
-//            cacheUtils
-//                .get(
-//                    FastIotConstants.CacheConfigKey.DEFAULT_RULE_CHAIN,
-//                    SecurityContext.getCurrentUser().getTenantId());
-//    if (null != result && result.isPresent()) {
-//      return result.get();
-//    }
-//    try {
-//      if (tbConfig.isEnabled()) {
-//        TBPageData tbPageData = tbConnectService.getRuleChains(10, 0).get();
-//        if (null == tbPageData || null == tbPageData.getData()) {
-//          throw new FastIotException(ErrorMessage.NONE_DEFAULT_RULE_CHAIN);
-//        }
-//        TBPageData convert = new TBPageData().getPageData(tbPageData,TBRuleChain.class);
-//        List<TBRuleChain> data = (List<TBRuleChain>) convert.getData();
-//        for (TBRuleChain tbRuleChain : data) {
-//          if (tbRuleChain.isRoot()) {
-//            defaultId = tbRuleChain.getId().getId();
-//            cacheUtils.put(
-//                FastIotConstants.CacheConfigKey.DEFAULT_RULE_CHAIN,
-//                SecurityContext.getCurrentUser().getTenantId(),
-//                defaultId);
-//            return defaultId;
-//          }
-//        }
-//      }
-//    } catch (ExecutionException | InterruptedException e) {
-//      throw new FastIotException(ErrorMessage.CONNECT_TO_TB_ERROR);
-//    }
-    return null;
+
+
+
+
+
+  @Override
+  public List<DeviceProfileDTO> findDeviceProfile(String tenantId) {
+    UUID profileId = UUID.fromString(tenantId);
+    List<DeviceProfile> profile =deviceProfileDao.find(new TenantId(profileId));
+    return ReflectUtils.sourceToTarget(profile,DeviceProfileDTO.class);
   }
 }

@@ -9,12 +9,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
-import org.thingsboard.server.common.data.yunteng.core.exception.DataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OrganizationDTO;
@@ -26,7 +25,9 @@ import org.thingsboard.server.dao.device.DeviceCredentialsDao;
 import org.thingsboard.server.dao.device.DeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.entities.Organization;
 import org.thingsboard.server.dao.yunteng.entities.YtDevice;
+import org.thingsboard.server.dao.yunteng.entities.YtDeviceProfile;
 import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceProfileMapper;
 import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtDeviceService;
@@ -47,7 +48,8 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   private final DeviceCredentialsDao deviceCredentialsDao;
 
 
-  private final OrganizationMapper organizationMapper;
+  private final OrganizationMapper ytOrganizationMapper;
+  private final DeviceProfileMapper ytDeviceProfileMapper;
   @Override
   // @Transactional
   // 事务会导致 tbDBService 多数据源失效
@@ -84,7 +86,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
 
   private void validateUpdate(DeviceDTO deviceDTO) {
     if (StringUtils.isAllBlank(deviceDTO.getName())) {
-      throw new DataValidationException("device name must be specific");
+      throw new YtDataValidationException("device name must be specific");
     }
   }
 
@@ -132,21 +134,21 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     String tenantId = deviceDTO.getTenantId();
     if (StringUtils.isBlank(deviceDTO.getName())) {
-      throw new DataValidationException("device name cannot be blank");
+      throw new YtDataValidationException("device name cannot be blank");
     }
     // validate IOT DB
     if (StringUtils.isBlank(deviceDTO.getProfileId())) {
-      throw new DataValidationException("device profile cannot be blank");
+      throw new YtDataValidationException("device profile cannot be blank");
     }
     if (StringUtils.isBlank(deviceDTO.getDeviceToken()) && !insert) {
-      throw new DataValidationException("device token cannot be blank");
+      throw new YtDataValidationException("device token cannot be blank");
     }
     // 验证设备名称是否已经存在 如果此处直接使用deviceDTO 将有误
     if (insert) {
       DeviceDTO check = new DeviceDTO();
       check.setName(deviceDTO.getName());
-      if (findDeviceInfo(tenantId,check).size() > 0) {
-        throw new DataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
+      if (findTbDeviceId(tenantId,check).size() > 0) {
+        throw new YtDataValidationException(ErrorMessage.NAME_ALREADY_EXISTS.getMessage());
       }
 
       if (StringUtils.isNotBlank(deviceDTO.getDeviceToken())) {
@@ -156,7 +158,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
                                 .lambda()
                                 .eq(YtDevice::getDeviceToken, deviceDTO.getDeviceToken()));
         if (!devices.isEmpty()) {
-          throw new DataValidationException("设备Device Token已经存在!");
+          throw new YtDataValidationException("设备Device Token已经存在!");
         }
       }
     }else{
@@ -166,13 +168,12 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
       }
     }
     // 验证数据profileId的正确性
-    TenantId tenant = new TenantId(UUID.fromString(tenantId));
-    DeviceProfile deviceProfile = deviceProfileDao.findById(tenant,UUID.fromString(deviceDTO.getProfileId()));
-    Organization organization = organizationMapper.selectById(deviceDTO.getOrganizationId());
+    YtDeviceProfile deviceProfile = ytDeviceProfileMapper.selectById(deviceDTO.getProfileId());
+    Organization organization = ytOrganizationMapper.selectById(deviceDTO.getOrganizationId());
     if (null == deviceProfile || null == organization) {
-      throw new DataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(tenantId)) {
-      throw new DataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
+      throw new YtDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
     return true;
   }
@@ -208,7 +209,20 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
     return device.getDTO(DeviceDTO.class);
   }
 
+  @Override
+  public List<String> findTbDeviceId(String tenantId, Set<String> ids) {
+    LambdaQueryWrapper<YtDevice> queryWrapper =
+            new QueryWrapper<YtDevice>()
+                    .lambda()
+                    .eq(YtDevice::getTenantId, tenantId)
+                    .in(YtDevice::getId, ids);
 
+    List<String> tbDeviceIds =
+            baseMapper.selectList(queryWrapper).stream()
+                    .map(YtDevice::getTbDeviceId)
+                    .collect(Collectors.toList());
+    return tbDeviceIds;
+  }
 
   @Override
   @Transactional
@@ -219,15 +233,8 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
             .eq(YtDevice::getTenantId, tenantId)
             .in(YtDevice::getId, ids);
 
-    List<String> tbDeviceIds =
-        baseMapper.selectList(queryWrapper).stream()
-            .map(YtDevice::getTbDeviceId)
-            .collect(Collectors.toList());
     baseMapper.delete(queryWrapper);
-    // 忽略删除进度，也不管是否删除了
-/*    if (tbConfig.isEnabled()) {
-      tbDeviceIds.forEach(tbConnectService::deleteDevice);
-    }*/
+
   }
 
   @Override
@@ -250,7 +257,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
       organizationIds.add(organizationId);
       // 查询该组织的所有子类
       List<OrganizationDTO> organizationDTOS =
-          organizationMapper.findOrganizationTreeList(
+          ytOrganizationMapper.findOrganizationTreeList(
               tenantId, organizationIds);
       List<String> queryOrganizationIds = new ArrayList<>();
       organizationDTOS.forEach(
@@ -265,7 +272,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
   }
 
   @Override
-  public List<DeviceDTO> findDeviceInfo(String tenantId,DeviceDTO deviceDTO) {
+  public List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO) {
     List<YtDevice> deviceList =
         baseMapper.selectList(
             new QueryWrapper<YtDevice>()

+package org.thingsboard.server.dao.yunteng.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
+import org.thingsboard.server.dao.yunteng.entities.YtDeviceProfile;
+
+import java.util.List;
+
+@Mapper
+public interface DeviceProfileMapper extends BaseMapper<YtDeviceProfile> {
+
+    List<DeviceProfileDTO> getDeviceProfileInfo(DeviceProfileDTO deviceProfileDTO);
+}

-package org.thingsboard.server.dao.yunteng.service;
-
-import org.thingsboard.server.common.data.yunteng.dto.AlarmProfileDTO;
-
-import java.util.Set;
-
-public interface YtAlarmProfileService {
-    /**
-     * 保存告警设置
-     * @param alarmProfileDTO 告警设置相关信息
-     * @return AlarmProfileDTO
-     */
-    AlarmProfileDTO saveOrUpdateAlarmProfile(String tenantId,AlarmProfileDTO alarmProfileDTO);
-
-    /**
-     * 删除告警配置
-     * @param ids 删除的ids
-     * @return 删除结果：true 成功 false 失败
-     */
-    boolean deleteAlarmProfile(Set<String> ids);
-
-    /**
-     * 根据设备配置ID查询告警配置信息
-     * @param deviceProfileId 设备配置ID
-     * @return 告警配置信息
-     */
-    AlarmProfileDTO findAlarmProfileByDeviceProfileId(String tenantId,String deviceProfileId);
-}

 package org.thingsboard.server.dao.yunteng.service;
 
+import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.PageData;
 
@@ -17,5 +18,14 @@ public interface YtDeviceProfileService {
 
   PageData<DeviceProfileDTO> page(String tenantId, Map<String, Object> queryMap);
 
-  List<DeviceProfileDTO> findDeviceProfile(String tenantId,DeviceProfileDTO deviceProfileDTO);
+  List<DeviceProfileDTO> findDeviceProfile(String tenantId);
+
+
+
+  /**
+   * 验证表单数据有效性
+   * @param ytDeviceProfileDTO
+   * @return
+   */
+  boolean validateFormdata(DeviceProfileDTO ytDeviceProfileDTO);
 }

@@ -28,5 +28,7 @@ public interface YtDeviceService {
    * @param deviceDTO 过滤参数
    * @return List<DeviceDTO>
    */
-  List<DeviceDTO> findDeviceInfo(String tenantId,DeviceDTO deviceDTO);
+  List<DeviceDTO> findTbDeviceId(String tenantId, DeviceDTO deviceDTO);
+
+  List<String> findTbDeviceId(String tenantId, Set<String> ids);
 }

+<?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.DeviceProfileMapper">
+    <resultMap type="org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO" id="deviceProfileMap">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+<!--        <result property="convertJs" column="convert_js"/>-->
+        <result property="description" column="description"/>
+        <result property="transportType" column="transport_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="tbProfileId" column="tb_profile_id"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="creator" column="creator"/>
+        <result property="updater" column="updater"/>
+    </resultMap>
+    <select id="getDeviceProfileInfo" resultMap="deviceProfileMap">
+        SELECT id,name
+--         ,convert_js
+             ,description,transport_type,tb_profile_id,tenant_id,create_time,update_time,creator,updater FROM
+        iotfs_device_profile
+        <where>
+            <if test="id !=null and id!=''">
+                AND id = #{id}
+            </if>
+        </where>
+    </select>
+</mapper>