fix: 删除了TBPageData

@@ -62,14 +62,14 @@ class YtDeviceProfileControllerTest extends BaseControllerTest{
     public static DeviceProfileDTO profileNoAlarm(String tenantId, DeviceTransportType type){
     public static DeviceProfileDTO profileNoAlarm(String tenantId, DeviceTransportType type){
         DeviceProfileDTO profile =new DeviceProfileDTO();
         DeviceProfileDTO profile =new DeviceProfileDTO();
         profile.setTenantId(tenantId);
         profile.setTenantId(tenantId);
-        profile.setTransportType(type);
+        profile.setTransportType(type.name());
         return  profile;
         return  profile;
     }
     }
 
 
     public static DeviceProfileDTO profileAlarm(String tenantId, DeviceTransportType type){
     public static DeviceProfileDTO profileAlarm(String tenantId, DeviceTransportType type){
         DeviceProfileDTO profile =new DeviceProfileDTO();
         DeviceProfileDTO profile =new DeviceProfileDTO();
         profile.setTenantId(tenantId);
         profile.setTenantId(tenantId);
-        profile.setTransportType(type);
+        profile.setTransportType(type.name());
         return  profile;
         return  profile;
     }
     }
 }
 }

-package org.thingsboard.server.common.data.yunteng.utils.tools;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.thingsboard.common.util.JacksonUtil;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-public class TBPageData<T> implements Serializable {
-
-  private static final long serialVersionUID = -914237744254466700L;
-
-  private Collection<T> data;
-  private int totalPages;
-  private long totalElements;
-
-  @JsonProperty("hasNext")
-  private boolean hasNext;
-
-  public TBPageData(Collection<T> data, int totalPages, long totalElements, boolean hasNext) {
-    this.data = data;
-    this.totalPages = totalPages;
-    this.totalElements = totalElements;
-    this.hasNext = hasNext;
-  }
-
-  public <D> TBPageData<D> getPageData(TBPageData<T> data, Class<D> target){
-    List<D> targetList = new ArrayList<>();
-    for(T t:data.getData()){
-      targetList.add(JacksonUtil.convertValue(t,target));
-    }
-    return new TBPageData<>(targetList,data.totalPages,data.totalElements,data.hasNext);
-  }
-}

@@ -8,7 +8,6 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.AlarmInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.common.data.yunteng.utils.tools.TBPageData;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 import org.thingsboard.server.dao.yunteng.service.YtAlarmInfoService;
 
 
 import java.util.List;
 import java.util.List;
@@ -120,20 +119,21 @@ public class YtAlarmInfoServiceImpl implements YtAlarmInfoService {
     IPage<AlarmInfo> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
     IPage<AlarmInfo> page = getPage(queryMap, FastIotConstants.DefaultOrder.CREATE_TIME,false);
     IPage<AlarmInfo> alarmInfoIPage = alarmInfoBaseMapper.selectPage(page,queryMap);*/
     IPage<AlarmInfo> alarmInfoIPage = alarmInfoBaseMapper.selectPage(page,queryMap);*/
 
 
-    try {
-      TBPageData tbPageData = null;//tbConnectService.getAlarmInfos(queryMap).get();
-      System.out.println("==================tbPageData:" + tbPageData);
-      List<AlarmInfoDTO> alarmInfoDTOS = ReflectUtils.sourceToTarget(tbPageData.getData(), AlarmInfoDTO.class);
-      YtPageData<AlarmInfoDTO> ytPageData = new YtPageData();
-      ytPageData.setItems(alarmInfoDTOS);
-
-      System.out.println("==================alarmInfoDTOS:" + alarmInfoDTOS);
-      return ytPageData;
-    } catch (Exception e) {
-      log.error("create TBAlarmInfo error {}", e.getMessage());
-      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
-    }
+//    try {
+//      TBPageData tbPageData = null;//tbConnectService.getAlarmInfos(queryMap).get();
+//      System.out.println("==================tbPageData:" + tbPageData);
+//      List<AlarmInfoDTO> alarmInfoDTOS = ReflectUtils.sourceToTarget(tbPageData.getData(), AlarmInfoDTO.class);
+//      YtPageData<AlarmInfoDTO> ytPageData = new YtPageData();
+//      ytPageData.setItems(alarmInfoDTOS);
+//
+//      System.out.println("==================alarmInfoDTOS:" + alarmInfoDTOS);
+//      return ytPageData;
+//    } catch (Exception e) {
+//      log.error("create TBAlarmInfo error {}", e.getMessage());
+//      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+//    }
     //return getPageData(alarmInfoIPage,AlarmInfoDTO.class);
     //return getPageData(alarmInfoIPage,AlarmInfoDTO.class);
+    return null;
   }
   }
 
 
 
 

@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
@@ -142,8 +141,7 @@ public class YtDeviceProfileServiceImpl
 
 
         for (String id : ids) {
         for (String id : ids) {
             Validator.validateId(UUID.fromString(id),"Incorrect device profile id to deal.");
             Validator.validateId(UUID.fromString(id),"Incorrect device profile id to deal.");
-            LambdaQueryWrapper filter = new QueryWrapper<AlarmProfile>()
-                    .lambda()
+            LambdaQueryWrapper filter = new LambdaQueryWrapper<AlarmProfile>()
                     .eq(AlarmProfile::getTenantId, tenantId)
                     .eq(AlarmProfile::getTenantId, tenantId)
                     .in(AlarmProfile::getDeviceProfileId, id);
                     .in(AlarmProfile::getDeviceProfileId, id);
             alarmProfileMapper.delete(filter);
             alarmProfileMapper.delete(filter);

@@ -16,11 +16,11 @@ import org.mybatis.spring.SqlSessionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.cluster.TbClusterService;
+import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
-import org.thingsboard.server.common.data.yunteng.utils.tools.TBPageData;
 import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 import org.thingsboard.server.dao.yunteng.entities.BaseEntity;
 
 
 import java.util.Collection;
 import java.util.Collection;
@@ -75,13 +75,6 @@ public abstract class AbstractBaseService<M extends BaseMapper<T>, T extends Bas
     List<D> targetList = ReflectUtils.sourceToTarget(iPage.getRecords(), target);
     List<D> targetList = ReflectUtils.sourceToTarget(iPage.getRecords(), target);
     return new YtPageData<>(targetList, iPage.getTotal());
     return new YtPageData<>(targetList, iPage.getTotal());
   }
   }
-
-  protected <D> YtPageData<D> getPageData(TBPageData<T> tbPageData, Class<D> target){
-    List<D> targetList = ReflectUtils.sourceToTarget(tbPageData.getData(),target);
-    return new YtPageData<>(targetList, tbPageData.getTotalElements());
-  }
-
-
   /**
   /**
    * 批量插入
    * 批量插入
    *
    *