修复 编辑设备的连接信息不生效的问题

src/main/java/com/yunfeiyun/agmp/iotm/util/MyPageUtil.java

@@ -0,0 +1,35 @@
+package com.yunfeiyun.agmp.iotm.util;
+
+import com.github.pagehelper.PageInfo;
+import com.yunfeiyun.agmp.common.constant.ErrorCode;
+import com.yunfeiyun.agmp.common.core.page.TableDataInfo;
+import com.yunfeiyun.agmp.common.core.text.Convert;
+import com.yunfeiyun.agmp.common.utils.ServletUtils;
+
+import java.util.List;
+
+import static com.yunfeiyun.agmp.common.core.page.TableSupport.PAGE_NUM;
+
+public class MyPageUtil {
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public static TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(ErrorCode.SUCCESS.getCode());
+        rspData.setMsg(ErrorCode.SUCCESS.getMessage());
+        PageInfo pageInfo = new PageInfo(list);
+        //处理不存在的页码
+        int queryParamPageNumber = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+        if (pageInfo.getPageNum() < 1) {
+            pageInfo.setPageNum(1);
+        }
+        if (queryParamPageNumber > pageInfo.getPages()) {
+            list.clear();
+        }
+        rspData.setData(list);
+        rspData.setTotal(pageInfo.getTotal());
+        return rspData;
+    }
+}

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

@@ -58,8 +58,7 @@ public class IotDeviceController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(IotDeviceListReqVo reqVo) {
         startPage();
-        List<IotDeviceListResVo> list = iotDeviceService.seletIotDeviceList(reqVo);
-        return getDataTable(list);
+        return iotDeviceService.seletIotDeviceList(reqVo);
     }
 
     /**

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

@@ -1,5 +1,6 @@
 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.device.common.domin.IotDeviceBaseCtlReqVo;
@@ -22,7 +23,7 @@ public interface IIotDeviceService
 {
     public int addIotDevice(IotDeviceAddReqVo reqVo);
 
-    public List<IotDeviceListResVo> seletIotDeviceList(IotDeviceListReqVo reqVo);
+    public TableDataInfo seletIotDeviceList(IotDeviceListReqVo reqVo);
 
     public int editIotDevice(IotDeviceEditReqVo reqVo);
 

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

@@ -4,6 +4,7 @@ import java.util.*;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 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;
@@ -13,10 +14,12 @@ import com.yunfeiyun.agmp.iot.common.enums.IotDeviceDelStatusEnum;
 import com.yunfeiyun.agmp.iot.common.enums.IotDeviceStatusTypeEnum;
 import com.yunfeiyun.agmp.iot.common.exception.IotBizException;
 import com.yunfeiyun.agmp.iot.common.service.TypeCacheService;
+import com.yunfeiyun.agmp.iotm.common.controller.BaseController;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseCtlReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.domin.IotDeviceBaseListReqVo;
 import com.yunfeiyun.agmp.iotm.device.common.service.IotDeviceBaseService;
 
+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;
@@ -121,7 +124,7 @@ public class IotDeviceServiceImpl implements IIotDeviceService
     }
 
     @Override
-    public List<IotDeviceListResVo> seletIotDeviceList(IotDeviceListReqVo reqVo) {
+    public TableDataInfo seletIotDeviceList(IotDeviceListReqVo reqVo) {
         IotDevice selectIotDevice = new IotDevice();
         selectIotDevice.setDevCode(reqVo.getDevCode());
         selectIotDevice.setDevName(reqVo.getDevName());
@@ -130,13 +133,18 @@ public class IotDeviceServiceImpl implements IIotDeviceService
         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 : iotDeviceList) {
+        for (IotDevice iotDevice : data) {
             IotDeviceListResVo iotDeviceListResVo = new IotDeviceListResVo();
             BeanUtils.copyProperties(iotDevice,iotDeviceListResVo);
             iotDeviceListResVoList.add(iotDeviceListResVo);
         }
-        return iotDeviceListResVoList;
+        tableDataInfo.setData(iotDeviceListResVoList);
+        return tableDataInfo;
     }
 
     @Override