优化分页逻辑，统一使用分页工具类

src/main/java/com/yunfeiyun/agmp/iotm/web/controller/IotDeviceController.java

@@ -1,10 +1,11 @@
 package com.yunfeiyun.agmp.iotm.web.controller;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
-import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.annotation.Log;
+import com.yunfeiyun.agmp.common.core.controller.BaseController;
+import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
+import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.enums.BusinessType;
+import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceEditReqVo;
@@ -12,23 +13,16 @@ import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceModifyReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.resvo.IotDeviceListResVo;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
-import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.yunfeiyun.agmp.common.annotation.Log;
-import com.yunfeiyun.agmp.common.core.controller.BaseController;
-import com.yunfeiyun.agmp.common.core.domain.AjaxResult;
-import com.yunfeiyun.agmp.common.enums.BusinessType;
-import com.yunfeiyun.agmp.common.utils.poi.ExcelUtil;
-import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 设备基础Controller
@@ -60,7 +54,20 @@ public class IotDeviceController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(IotDeviceListReqVo reqVo) {
         startPage();
-        return iotDeviceService.seletIotDeviceList(reqVo);
+        List<IotDevice> iotDeviceList = iotDeviceService.seletIotDeviceList(reqVo);
+
+        TableDataInfo tableDataInfo = getDataTable(iotDeviceList);
+        List<IotDevice> data = (List<IotDevice>) tableDataInfo.getData();
+
+        List<IotDeviceListResVo> iotDeviceListResVoList = new ArrayList<>();
+        for (IotDevice iotDevice : data) {
+            IotDeviceListResVo iotDeviceListResVo = new IotDeviceListResVo();
+            BeanUtils.copyProperties(iotDevice, iotDeviceListResVo);
+            iotDeviceListResVoList.add(iotDeviceListResVo);
+        }
+        tableDataInfo.setData(iotDeviceListResVoList);
+
+        return tableDataInfo;
     }
 
     /**

src/main/java/com/yunfeiyun/agmp/iotm/web/service/IIotDeviceService.java

@@ -1,6 +1,5 @@
 package com.yunfeiyun.agmp.iotm.web.service;
 
-import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.iot.common.domain.IotDevice;
 import com.yunfeiyun.agmp.iot.common.domain.IotDeviceconn;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceAddReqVo;
@@ -20,7 +19,7 @@ import java.util.List;
 public interface IIotDeviceService {
     public int addIotDevice(IotDeviceAddReqVo reqVo);
 
-    public TableDataInfo seletIotDeviceList(IotDeviceListReqVo reqVo);
+    public List<IotDevice> seletIotDeviceList(IotDeviceListReqVo reqVo);
 
     public int editIotDevice(IotDeviceEditReqVo reqVo);
 

src/main/java/com/yunfeiyun/agmp/iotm/web/service/impl/IotDeviceServiceImpl.java

@@ -1,7 +1,6 @@
 package com.yunfeiyun.agmp.iotm.web.service.impl;
 
 import com.yunfeiyun.agmp.common.constant.ErrorCode;
-import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
 import com.yunfeiyun.agmp.common.utils.DateUtils;
 import com.yunfeiyun.agmp.common.utils.SecurityUtils;
 import com.yunfeiyun.agmp.common.utils.StringUtils;
@@ -16,7 +15,6 @@ import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceRefreshService;
 import com.yunfeiyun.agmp.iotm.mq.service.SendToIotsMsgService;
 import com.yunfeiyun.agmp.iotm.mq.service.SendToTosMsgService;
-import com.yunfeiyun.agmp.iotm.util.MyPageUtil;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceAddReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceEditReqVo;
 import com.yunfeiyun.agmp.iotm.web.domain.reqvo.IotDeviceListReqVo;
@@ -26,14 +24,16 @@ import com.yunfeiyun.agmp.iotm.web.mapper.IotDeviceMapper;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceService;
 import com.yunfeiyun.agmp.iotm.web.service.IIotDeviceconnService;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 设备基础Service业务层处理
@@ -142,27 +142,14 @@ public class IotDeviceServiceImpl implements IIotDeviceService {
     }
 
     @Override
-    public TableDataInfo seletIotDeviceList(IotDeviceListReqVo reqVo) {
+    public List<IotDevice> seletIotDeviceList(IotDeviceListReqVo reqVo) {
         IotDevice selectIotDevice = new IotDevice();
         selectIotDevice.setDevCode(reqVo.getDevCode());
         selectIotDevice.setDevName(reqVo.getDevName());
         selectIotDevice.setDevclassBid(reqVo.getDevclassBid());
         selectIotDevice.setDevtypeBid(reqVo.getDevtypeBid());
         selectIotDevice.setDevStatus(reqVo.getDevStatus());
-
-        List<IotDevice> iotDeviceList = selectIotDeviceList(selectIotDevice);
-
-        TableDataInfo tableDataInfo = MyPageUtil.getDataTable(iotDeviceList);
-        List<IotDevice> data = (List<IotDevice>) tableDataInfo.getData();
-
-        List<IotDeviceListResVo> iotDeviceListResVoList = new ArrayList<>();
-        for (IotDevice iotDevice : data) {
-            IotDeviceListResVo iotDeviceListResVo = new IotDeviceListResVo();
-            BeanUtils.copyProperties(iotDevice, iotDeviceListResVo);
-            iotDeviceListResVoList.add(iotDeviceListResVo);
-        }
-        tableDataInfo.setData(iotDeviceListResVoList);
-        return tableDataInfo;
+        return selectIotDeviceList(selectIotDevice);
     }
 
     @Override