修改设备网关信息分页

share-system/src/main/java/share/system/service/impl/DeviceGatewayServiceImpl.java

 package share.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
 import share.common.core.page.PageDomain;
 import share.common.core.page.TableDataInfo;
 import share.common.core.page.TableSupport;
 import share.common.enums.DeviceStatusEnum;
-import share.common.enums.YesNoEnum;
 import share.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import share.system.domain.*;
+import share.system.domain.DeviceGateway;
+import share.system.domain.DeviceGatewayDto;
+import share.system.domain.SStore;
 import share.system.domain.vo.DeviceGatewayVo;
-import share.system.domain.vo.DeviceVo;
 import share.system.mapper.DeviceGatewayMapper;
 import share.system.mapper.SStoreMapper;
 import share.system.service.DeviceGatewayService;
 import share.system.service.ISysConfigService;
 import share.system.service.SmsService;
 
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 设备网关信息Service业务层处理
  * 
@@ -159,7 +158,13 @@ public class DeviceGatewayServiceImpl extends ServiceImpl<DeviceGatewayMapper, D
     @Override
     public TableDataInfo deviceGatewayPage(DeviceGatewayDto deviceGatewayDto) {
         List<DeviceGateway> deviceGateways = deviceGatewayMapper.selectDeviceGatewayList(deviceGatewayDto);
-        List<DeviceGatewayVo> deviceGatewayVoList = convertDosToVos(deviceGateways);
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setTotal(deviceGateways.size());
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        int start = (pageDomain.getPageNum() - 1) * pageDomain.getPageSize();
+        int end = Math.min(start + pageDomain.getPageSize(), deviceGateways.size());
+        List<DeviceGateway> deviceGatewayVos = deviceGateways.subList(start, end);
+        List<DeviceGatewayVo> deviceGatewayVoList = convertDosToVos(deviceGatewayVos);
         if (CollectionUtils.isNotEmpty(deviceGatewayVoList)) {
             List<SStore> sStoreList = storeMapper.selectList(new LambdaQueryWrapper<>());
             deviceGatewayVoList.stream().forEach(item -> {
@@ -172,13 +177,7 @@ public class DeviceGatewayServiceImpl extends ServiceImpl<DeviceGatewayMapper, D
             });
         }
         deviceGatewayVoList.sort(Comparator.comparing(DeviceGatewayVo::getCreateTime).reversed());
-        PageDomain pageDomain = TableSupport.buildPageRequest();
-        int start = (pageDomain.getPageNum() - 1) * pageDomain.getPageSize();
-        int end = Math.min(start + pageDomain.getPageSize(), deviceGatewayVoList.size());
-        List<DeviceGatewayVo> deviceGatewayVos = deviceGatewayVoList.subList(start, end);
-        TableDataInfo tableDataInfo = new TableDataInfo();
-        tableDataInfo.setRows(deviceGatewayVos);
-        tableDataInfo.setTotal(deviceGatewayVoList.size());
+        tableDataInfo.setRows(deviceGatewayVoList);
         tableDataInfo.setCode(200);
         tableDataInfo.setMsg("查询成功");
         return tableDataInfo;