diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 3082500..f48bc3c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -157,21 +157,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 3082500..f48bc3c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -157,21 +157,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
index 6ffa7a3..30667b8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
@@ -1,18 +1,17 @@
 package com.casic.missiles.modular.system.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
-import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.casic.missiles.modular.system.service.IBusObserpoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
 import java.util.List;

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 3082500..f48bc3c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -157,21 +157,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
index 6ffa7a3..30667b8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
@@ -1,18 +1,17 @@
 package com.casic.missiles.modular.system.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
-import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.casic.missiles.modular.system.service.IBusObserpoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
 import java.util.List;
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index a1181c7..1ecbee5 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.modular.system.dto.monitor.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@
 
     List<MonitorPointList> monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId);
 
-    List<BusMonipoiInfo> monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
+    List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 3082500..f48bc3c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -157,21 +157,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
index 6ffa7a3..30667b8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
@@ -1,18 +1,17 @@
 package com.casic.missiles.modular.system.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
-import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.casic.missiles.modular.system.service.IBusObserpoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
 import java.util.List;
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index a1181c7..1ecbee5 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.modular.system.dto.monitor.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@
 
     List<MonitorPointList> monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId);
 
-    List<BusMonipoiInfo> monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
+    List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index e60720c..94076bc 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -38,7 +38,7 @@
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
-        SELECT bmi.id,monitor_name AS monitorName
+        SELECT bmi.id,monitor_name AS monitorName,bmi.DEVICE_IP as ip
         FROM bus_monipoi_info bmi
             JOIN (
                 SELECT  id,DEPT_ID

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 3082500..f48bc3c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -157,21 +157,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
index 6ffa7a3..30667b8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
@@ -1,18 +1,17 @@
 package com.casic.missiles.modular.system.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
-import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.casic.missiles.modular.system.service.IBusObserpoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
 import java.util.List;
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index a1181c7..1ecbee5 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.modular.system.dto.monitor.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@
 
     List<MonitorPointList> monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId);
 
-    List<BusMonipoiInfo> monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
+    List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index e60720c..94076bc 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -38,7 +38,7 @@
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
-        SELECT bmi.id,monitor_name AS monitorName
+        SELECT bmi.id,monitor_name AS monitorName,bmi.DEVICE_IP as ip
         FROM bus_monipoi_info bmi
             JOIN (
                 SELECT  id,DEPT_ID
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
index 4a35cd4..781c9ab 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
@@ -8,5 +8,6 @@
 public class MonitorPointList {
     private Long id;
     private String monitorName;
+    private String ip;
 }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
index 3082500..f48bc3c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/task/CollectGasDataTask.java
@@ -157,21 +157,21 @@
         public void run() {
             System.out.println("Thread-" + deviceIp + " -> start... " + new Date());
             // 登录，登录失败就一直尝试登录
-            while (true) {
-                boolean register = registerAndStartSerial();
-                if (register) {
-                    break;
-                }
-            }
-            // 登录成功后，按每秒一次查询甲烷数据
-            while (true) {
-                try {
-                    sendGasCommand();
-                    Thread.sleep(collectInterval);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            }
+//            while (true) {
+//                boolean register = registerAndStartSerial();
+//                if (register) {
+//                    break;
+//                }
+//            }
+//            // 登录成功后，按每秒一次查询甲烷数据
+//            while (true) {
+//                try {
+//                    sendGasCommand();
+//                    Thread.sleep(collectInterval);
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//            }
         }
     }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
index 6ffa7a3..30667b8 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusObserpoiInfoController.java
@@ -1,18 +1,17 @@
 package com.casic.missiles.modular.system.controller;
 
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.page.PageFactory;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
-import com.casic.missiles.modular.system.model.BusStationInfo;
 import com.casic.missiles.modular.system.service.IBusObserpoiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
 import java.util.List;
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index a1181c7..1ecbee5 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -7,6 +7,7 @@
 import com.casic.missiles.modular.system.dto.monitor.MonitorPointList;
 import com.casic.missiles.modular.system.model.BusMonipoiInfo;
 import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@
 
     List<MonitorPointList> monitorList(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId);
 
-    List<BusMonipoiInfo> monitorListPage(@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
+    List<BusMonipoiInfo> monitorListPage(@Param("page") Page<BusMonipoiInfo> page,@Param("scope") DataScope dataScope, @Param("stationId")Long stationId,@Param("keyword")String keyword);
 
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index e60720c..94076bc 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -38,7 +38,7 @@
     </sql>
 
     <select id="monitorList" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorPointList">
-        SELECT bmi.id,monitor_name AS monitorName
+        SELECT bmi.id,monitor_name AS monitorName,bmi.DEVICE_IP as ip
         FROM bus_monipoi_info bmi
             JOIN (
                 SELECT  id,DEPT_ID
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
index 4a35cd4..781c9ab 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorPointList.java
@@ -8,5 +8,6 @@
 public class MonitorPointList {
     private Long id;
     private String monitorName;
+    private String ip;
 }
 
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
index 245902d..05a4ac0 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java
@@ -50,7 +50,7 @@
     public Page<BusMonipoiInfo> monitorListPage(Page<BusMonipoiInfo> page, Long stationId, String keyword) throws Exception {
         DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
         dataScope.setScopeName("DEPT_ID");
-        List<BusMonipoiInfo> monitorPointLists = this.baseMapper.monitorListPage(dataScope, stationId, keyword);
+        List<BusMonipoiInfo> monitorPointLists = this.baseMapper.monitorListPage(page,dataScope, stationId, keyword);
         for (BusMonipoiInfo busMonipoiInfo : monitorPointLists) {
             DictCodeUtils.convertDictCodeToName(busMonipoiInfo);
         }