diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
index 11f9bfc..06f6092 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡航预置点信息表 Mapper 接口
@@ -22,4 +27,11 @@
 
     Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId,
                                         @Param("cruiseName") String cruiseName);
+
+    List<BusObserpoiInfo> selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest);
+
+    List<BusObserpoiInfo> pageList(@Param("page")  Page<BusObserpoiInfo> page,
+                                   @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest,
+                                   @Param("dataScope") DataScope dataScope);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
index 11f9bfc..06f6092 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡航预置点信息表 Mapper 接口
@@ -22,4 +27,11 @@
 
     Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId,
                                         @Param("cruiseName") String cruiseName);
+
+    List<BusObserpoiInfo> selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest);
+
+    List<BusObserpoiInfo> pageList(@Param("page")  Page<BusObserpoiInfo> page,
+                                   @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest,
+                                   @Param("dataScope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 8b833e6..1c27890 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -4,24 +4,25 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusObserpoiInfo">
-        <id column="ID" property="id" />
-        <result column="SERIAL_NAME" property="serialName" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STOP_TIME" property="stopTime" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="SPEED" property="speed" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="LINE_NAME" property="lineName" />
-        <result column="UPDATE_TIME" property="updateTime" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="SERIAL_NAME" property="serialName"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STOP_TIME" property="stopTime"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="SPEED" property="speed"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="LINE_NAME" property="lineName"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, SERIAL_NAME AS serialName, SERIAL_NUM AS serialNum, DIRECTION AS direction, PITCH AS pitch, MONITOR_ID AS monitorId, STOP_TIME AS stopTime, ALARM_VALUE AS alarmValue, SPEED AS speed, LINE_NUM AS lineNum, LINE_NAME AS lineName, UPDATE_TIME AS updateTime, TS AS ts
+        bo.ID
+        AS id, bo.SERIAL_NAME AS serialName, bo.SERIAL_NUM AS serialNum, bo.DIRECTION AS direction, bo.PITCH AS pitch, bo.MONITOR_ID AS monitorId, bo.STOP_TIME AS stopTime, bo.ALARM_VALUE AS alarmValue, bo.SPEED AS speed, bo.LINE_NUM AS lineNum, bo.LINE_NAME AS lineName,bo.UPDATE_TIME AS updateTime, bo.TS AS ts
     </sql>
     <select id="selectMaxNum" resultType="java.lang.Integer">
         select max(SERIAL_NUM)
@@ -43,4 +44,43 @@
             and LINE_NAME = #{cruiseName}
         </if>
     </select>
+
+    <select id="selectNoPage" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        bo.LINE_NUM as id,
+        bo.LINE_NAME as lineName
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.stationId != null and obserpoiRequest.stationId !=''">
+            and bm.STATION_ID = #{obserpoiRequest.stationId}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.lineNum != null and obserpoiRequest.lineNum !=''">
+            and bm.LINE_NUM = #{lineNum}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+
+
+
 </mapper>

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
index 11f9bfc..06f6092 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡航预置点信息表 Mapper 接口
@@ -22,4 +27,11 @@
 
     Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId,
                                         @Param("cruiseName") String cruiseName);
+
+    List<BusObserpoiInfo> selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest);
+
+    List<BusObserpoiInfo> pageList(@Param("page")  Page<BusObserpoiInfo> page,
+                                   @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest,
+                                   @Param("dataScope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 8b833e6..1c27890 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -4,24 +4,25 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusObserpoiInfo">
-        <id column="ID" property="id" />
-        <result column="SERIAL_NAME" property="serialName" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STOP_TIME" property="stopTime" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="SPEED" property="speed" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="LINE_NAME" property="lineName" />
-        <result column="UPDATE_TIME" property="updateTime" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="SERIAL_NAME" property="serialName"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STOP_TIME" property="stopTime"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="SPEED" property="speed"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="LINE_NAME" property="lineName"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, SERIAL_NAME AS serialName, SERIAL_NUM AS serialNum, DIRECTION AS direction, PITCH AS pitch, MONITOR_ID AS monitorId, STOP_TIME AS stopTime, ALARM_VALUE AS alarmValue, SPEED AS speed, LINE_NUM AS lineNum, LINE_NAME AS lineName, UPDATE_TIME AS updateTime, TS AS ts
+        bo.ID
+        AS id, bo.SERIAL_NAME AS serialName, bo.SERIAL_NUM AS serialNum, bo.DIRECTION AS direction, bo.PITCH AS pitch, bo.MONITOR_ID AS monitorId, bo.STOP_TIME AS stopTime, bo.ALARM_VALUE AS alarmValue, bo.SPEED AS speed, bo.LINE_NUM AS lineNum, bo.LINE_NAME AS lineName,bo.UPDATE_TIME AS updateTime, bo.TS AS ts
     </sql>
     <select id="selectMaxNum" resultType="java.lang.Integer">
         select max(SERIAL_NUM)
@@ -43,4 +44,43 @@
             and LINE_NAME = #{cruiseName}
         </if>
     </select>
+
+    <select id="selectNoPage" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        bo.LINE_NUM as id,
+        bo.LINE_NAME as lineName
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.stationId != null and obserpoiRequest.stationId !=''">
+            and bm.STATION_ID = #{obserpoiRequest.stationId}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.lineNum != null and obserpoiRequest.lineNum !=''">
+            and bm.LINE_NUM = #{lineNum}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+
+
+
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
new file mode 100644
index 0000000..bf8ba12
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiRequest {
+
+
+    //场站Id
+    private Long stationId;
+
+
+    // 	监控点Id
+    private Long monitorId;
+
+    // 	路线编号
+    private Long lineNum;
+
+    public BusObserpoiRequest() {
+    }
+
+
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
index 11f9bfc..06f6092 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡航预置点信息表 Mapper 接口
@@ -22,4 +27,11 @@
 
     Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId,
                                         @Param("cruiseName") String cruiseName);
+
+    List<BusObserpoiInfo> selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest);
+
+    List<BusObserpoiInfo> pageList(@Param("page")  Page<BusObserpoiInfo> page,
+                                   @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest,
+                                   @Param("dataScope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 8b833e6..1c27890 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -4,24 +4,25 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusObserpoiInfo">
-        <id column="ID" property="id" />
-        <result column="SERIAL_NAME" property="serialName" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STOP_TIME" property="stopTime" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="SPEED" property="speed" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="LINE_NAME" property="lineName" />
-        <result column="UPDATE_TIME" property="updateTime" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="SERIAL_NAME" property="serialName"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STOP_TIME" property="stopTime"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="SPEED" property="speed"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="LINE_NAME" property="lineName"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, SERIAL_NAME AS serialName, SERIAL_NUM AS serialNum, DIRECTION AS direction, PITCH AS pitch, MONITOR_ID AS monitorId, STOP_TIME AS stopTime, ALARM_VALUE AS alarmValue, SPEED AS speed, LINE_NUM AS lineNum, LINE_NAME AS lineName, UPDATE_TIME AS updateTime, TS AS ts
+        bo.ID
+        AS id, bo.SERIAL_NAME AS serialName, bo.SERIAL_NUM AS serialNum, bo.DIRECTION AS direction, bo.PITCH AS pitch, bo.MONITOR_ID AS monitorId, bo.STOP_TIME AS stopTime, bo.ALARM_VALUE AS alarmValue, bo.SPEED AS speed, bo.LINE_NUM AS lineNum, bo.LINE_NAME AS lineName,bo.UPDATE_TIME AS updateTime, bo.TS AS ts
     </sql>
     <select id="selectMaxNum" resultType="java.lang.Integer">
         select max(SERIAL_NUM)
@@ -43,4 +44,43 @@
             and LINE_NAME = #{cruiseName}
         </if>
     </select>
+
+    <select id="selectNoPage" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        bo.LINE_NUM as id,
+        bo.LINE_NAME as lineName
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.stationId != null and obserpoiRequest.stationId !=''">
+            and bm.STATION_ID = #{obserpoiRequest.stationId}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.lineNum != null and obserpoiRequest.lineNum !=''">
+            and bm.LINE_NUM = #{lineNum}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+
+
+
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
new file mode 100644
index 0000000..bf8ba12
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiRequest {
+
+
+    //场站Id
+    private Long stationId;
+
+
+    // 	监控点Id
+    private Long monitorId;
+
+    // 	路线编号
+    private Long lineNum;
+
+    public BusObserpoiRequest() {
+    }
+
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
new file mode 100644
index 0000000..8e2ce2b
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiResponse {
+
+
+    //预置点id
+    private Long id;
+    // 	线路编号
+    private Long lineNum;
+    // 	预置点编号名称
+    private String serialName;
+    // 	线路编号名称
+    private String lineName;
+    // 	方位角
+    private String direction;
+    // 	俯仰角
+    private String pitch;
+    // 	巡航速度
+    private String speed;
+    // 	停留时间
+    private String stopTime;
+    // 	报警阈值
+    private String alarmValue;
+    // 	创建时间
+    private String createTime;
+    // 	修改时间
+    private String updateTime;
+
+
+}

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
index 11f9bfc..06f6092 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡航预置点信息表 Mapper 接口
@@ -22,4 +27,11 @@
 
     Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId,
                                         @Param("cruiseName") String cruiseName);
+
+    List<BusObserpoiInfo> selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest);
+
+    List<BusObserpoiInfo> pageList(@Param("page")  Page<BusObserpoiInfo> page,
+                                   @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest,
+                                   @Param("dataScope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 8b833e6..1c27890 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -4,24 +4,25 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusObserpoiInfo">
-        <id column="ID" property="id" />
-        <result column="SERIAL_NAME" property="serialName" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STOP_TIME" property="stopTime" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="SPEED" property="speed" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="LINE_NAME" property="lineName" />
-        <result column="UPDATE_TIME" property="updateTime" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="SERIAL_NAME" property="serialName"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STOP_TIME" property="stopTime"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="SPEED" property="speed"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="LINE_NAME" property="lineName"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, SERIAL_NAME AS serialName, SERIAL_NUM AS serialNum, DIRECTION AS direction, PITCH AS pitch, MONITOR_ID AS monitorId, STOP_TIME AS stopTime, ALARM_VALUE AS alarmValue, SPEED AS speed, LINE_NUM AS lineNum, LINE_NAME AS lineName, UPDATE_TIME AS updateTime, TS AS ts
+        bo.ID
+        AS id, bo.SERIAL_NAME AS serialName, bo.SERIAL_NUM AS serialNum, bo.DIRECTION AS direction, bo.PITCH AS pitch, bo.MONITOR_ID AS monitorId, bo.STOP_TIME AS stopTime, bo.ALARM_VALUE AS alarmValue, bo.SPEED AS speed, bo.LINE_NUM AS lineNum, bo.LINE_NAME AS lineName,bo.UPDATE_TIME AS updateTime, bo.TS AS ts
     </sql>
     <select id="selectMaxNum" resultType="java.lang.Integer">
         select max(SERIAL_NUM)
@@ -43,4 +44,43 @@
             and LINE_NAME = #{cruiseName}
         </if>
     </select>
+
+    <select id="selectNoPage" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        bo.LINE_NUM as id,
+        bo.LINE_NAME as lineName
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.stationId != null and obserpoiRequest.stationId !=''">
+            and bm.STATION_ID = #{obserpoiRequest.stationId}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.lineNum != null and obserpoiRequest.lineNum !=''">
+            and bm.LINE_NUM = #{lineNum}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+
+
+
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
new file mode 100644
index 0000000..bf8ba12
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiRequest {
+
+
+    //场站Id
+    private Long stationId;
+
+
+    // 	监控点Id
+    private Long monitorId;
+
+    // 	路线编号
+    private Long lineNum;
+
+    public BusObserpoiRequest() {
+    }
+
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
new file mode 100644
index 0000000..8e2ce2b
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiResponse {
+
+
+    //预置点id
+    private Long id;
+    // 	线路编号
+    private Long lineNum;
+    // 	预置点编号名称
+    private String serialName;
+    // 	线路编号名称
+    private String lineName;
+    // 	方位角
+    private String direction;
+    // 	俯仰角
+    private String pitch;
+    // 	巡航速度
+    private String speed;
+    // 	停留时间
+    private String stopTime;
+    // 	报警阈值
+    private String alarmValue;
+    // 	创建时间
+    private String createTime;
+    // 	修改时间
+    private String updateTime;
+
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
index 9389234..cf72272 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -44,4 +46,9 @@
 
     boolean deleteCruise(String deviceIp, String cruiseName,int cruiseRoute );
 
+
+    List<BusObserpoiInfo> selectNoPage(BusObserpoiRequest obserpoiDTO);
+
+    List<BusObserpoiInfo>  pageList(Page<BusObserpoiInfo> page, BusObserpoiRequest obserpoiRequest);
+
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
index b5db367..ba81213 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusPlanController.java
@@ -1,7 +1,6 @@
 package com.casic.missiles.modular.system.controller;
 
 import cn.hutool.core.lang.Assert;
-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;
@@ -19,6 +18,7 @@
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -50,11 +50,12 @@
      */
     @RequestMapping(value = "/listPage")
     @ResponseBody
-    public Object listPage(String condition) {
+    public Object listPage(@RequestBody @Valid BusPlan busPlan) {
+
         Page<BusPlan> page = PageFactory.defaultPage();
-        QueryWrapper<BusPlan> query = new QueryWrapper<>();
-        page = busPlanService.page(page, query);
-        return super.packForBT(page);
+        List<BusPlan> busPlanList = busPlanService.pageList(page, busPlan);
+        page = page.setRecords(busPlanList);
+        return ResponseData.success(super.packForBT(page));
     }
 
     /**
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
index 5054b0a..860cfff 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/BusPlanMapper.java
@@ -1,7 +1,12 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.model.BusPlan;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,7 @@
  */
 public interface BusPlanMapper extends BaseMapper<BusPlan> {
 
+    List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
+                                   @Param("busPlan") BusPlan busPlan,
+                                   @Param("dataScope") DataScope dataScope);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
index 7f8c0a6..b04843c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusPlanMapper.xml
@@ -21,5 +21,26 @@
     <sql id="Base_Column_List">
         ID AS id, MONITOR_ID AS monitorId, LINE_NUM AS lineNum, TASK_NAME AS taskName, BEGIN_DATE AS beginDate, END_DATE AS endDate, BEGIN_TIME AS beginTime, END_TIME AS endTime, STATUS AS status, UPDATE_TIME AS updateTime, TS AS ts
     </sql>
-
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
+        SELECT
+        <include refid="Base_Column_List"/>,
+        FROM
+        bus_plan bp
+        WHERE 1=1
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
+            and bp.MONITOR_ID = #{busPlan.monitorId}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+        <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
+            and bp.LINE_NUM = #{busPlan.lineNum}
+        </if>
+    </select>
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
index 6877115..5b9638c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/IBusPlanService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.casic.missiles.modular.system.dto.PlanRequest;
 import com.casic.missiles.modular.system.model.BusPlan;
 
+import java.util.List;
+
 /**
  * <p>
  * 任务计划表 服务类
@@ -20,4 +23,6 @@
 
     boolean updateStatus(Long id,String status);
 
+    List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
index 2ac80d9..1189487 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/BusPlanServiceImpl.java
@@ -2,7 +2,10 @@
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.enums.BusinessExceptionEnum;
 import com.casic.missiles.enums.DictEnum;
 import com.casic.missiles.enums.StatusEnum;
@@ -24,6 +27,7 @@
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,6 +47,9 @@
     private IHCNetService ihcNetService;
 
     @Autowired
+    private AbstractPermissionContext permissionContext;
+
+    @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
     @Transactional
@@ -115,6 +122,14 @@
         return false;
     }
 
+    @Override
+    public List<BusPlan> pageList(Page<BusPlan> page, BusPlan busPlan) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,busPlan,dataScope);
+    }
+
     //开始job
     public void startTask(Date taskTime, Class cls, String jobName, String jobId, Long monitorId) {
         Map<String, Object> map = new HashMap<>();
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
index 1e46642..f75f866 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java
@@ -686,7 +686,6 @@
                 }
             });
         }
-
         return obserpoiInfoService.deleteCruise(deviceIp, cruiseName, cruiseValue);
     }
 
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 81211f6..d001cd3 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,105 +1,71 @@
-//package com.casic.missiles.modular.system.controller;
-//
-//import com.casic.missiles.core.base.controller.ExportController;
-//import com.stylefeng.guns.core.result.ResultData;
-//import org.springframework.stereotype.Controller;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.ResponseBody;
-//import org.springframework.web.bind.annotation.PathVariable;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import com.casic.missiles.core.page.PageFactory;
-//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-//import java.util.List;
-//import com.stylefeng.guns.core.common.constant.factory.PageFactory;
-//import org.springframework.web.bind.annotation.RequestParam;
-//import com.stylefeng.guns.modular.system.model.BusObserpoiInfo;
-//import com.stylefeng.guns.modular.system.service.IBusObserpoiInfoService;
-//
-///**
-// * 巡航预置点信息控制器
-// *
-// * @author dev
-// * @Date 2023-04-18 15:44:03
-// */
-//@Controller
-//@RequestMapping("/busObserpoiInfo")
-//public class BusObserpoiInfoController  extends ExportController {
-//
-//
-//    @Autowired
-//    private IBusObserpoiInfoService busObserpoiInfoService;
-//
-//
-//    /**
-//     * 获取巡航预置点信息列表
-//     */
-//    @RequestMapping(value = "/list")
-//    @ResponseBody
-//    public Object list(String condition) {
-//        return busObserpoiInfoService.selectList(null);
-//    }
-//
-//    /**
-//     * 获取巡航预置点信息分页列表
-//     */
-//    @RequestMapping(value = "/listPage")
-//    @ResponseBody
-//    public Object listPage(String condition) {
-//        Page<BusObserpoiInfo> page = new PageFactory<BusObserpoiInfo>().defaultPage();
-//        EntityWrapper<BusObserpoiInfo> query = new EntityWrapper<>();
-//        page =  busObserpoiInfoService.selectPage(page,query);
-//        return super.packForBT(page);
-//    }
-//    /**
-//     * 新增巡航预置点信息
-//     */
-//    @RequestMapping(value = "/add")
-//    @ResponseBody
-//    public Object add(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.insert(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 删除巡航预置点信息
-//     */
-//    @RequestMapping(value = "/delete")
-//    @ResponseBody
-//    public Object delete(@RequestParam String busObserpoiInfoId) {
-//        busObserpoiInfoService.deleteById(busObserpoiInfoId);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 批量删除
-//     */
-//    @RequestMapping(value = "/batchDelete")
-//    @ResponseBody
-//    public Object delete(@RequestParam("busObserpoiInfoIds") List<String> busObserpoiInfoIds) {
-//        busObserpoiInfoService.deleteBatchIds(busObserpoiInfoIds);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 修改巡航预置点信息
-//     */
-//    @RequestMapping(value = "/update")
-//    @ResponseBody
-//    public Object update(BusObserpoiInfo busObserpoiInfo) {
-//        busObserpoiInfoService.updateById(busObserpoiInfo);
-//        return SUCCESS_TIP;
-//    }
-//
-//    /**
-//     * 巡航预置点信息详情
-//     */
-//    @RequestMapping(value = "/detail/{busObserpoiInfoId}")
-//    @ResponseBody
-//    public Object detail(@PathVariable("busObserpoiInfoId") String busObserpoiInfoId) {
-//        ResultData<BusObserpoiInfo> resultData = new ResultData<BusObserpoiInfo>();
-//        resultData.setCode(200);
-//        resultData.setMessage("查询详情成功");
-//        resultData.setData(busObserpoiInfoService.selectById(busObserpoiInfoId));
-//        return resultData;
-//    }
-//}
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * 巡航预置点信息控制器
+ *
+ * @author dev
+ * @Date 2023-04-18 15:44:03
+ */
+@Controller
+@RequestMapping("/observ")
+public class BusObserpoiInfoController extends ExportController {
+
+
+    @Autowired
+    private IBusObserpoiInfoService busObserpoiInfoService;
+
+
+    /**
+     * 获取巡航预置点信息列表
+     */
+    @RequestMapping(value = "/list")
+    @ResponseBody
+    public Object list(@RequestBody @Valid BusObserpoiRequest obserpoiDTO) {
+        QueryWrapper<BusObserpoiInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getMonitorId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        queryWrapper.eq(ObjectUtil.isNotEmpty(obserpoiDTO.getStationId()), "MONITOR_ID", obserpoiDTO.getMonitorId());
+        return ResponseData.success(busObserpoiInfoService.selectNoPage(obserpoiDTO));
+    }
+
+    /**
+     * 获取巡航预置点信息分页列表
+     */
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage(@RequestBody @Valid BusObserpoiRequest obserpoiRequest) {
+        Page<BusObserpoiInfo> page = PageFactory.defaultPage();
+        List<BusObserpoiInfo> alarmRecordList = busObserpoiInfoService.pageList(page, obserpoiRequest);
+        page = page.setRecords(alarmRecordList);
+        return ResponseData.success(super.packForBT(page));
+    }
+
+
+
+    /**
+     * 修改巡航预置点信息
+     */
+    @RequestMapping(value = "/update")
+    @ResponseBody
+    public Object update(BusObserpoiInfo busObserpoiInfo) {
+        busObserpoiInfoService.updateById(busObserpoiInfo);
+        return SUCCESS_TIP;
+    }
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
index 11f9bfc..06f6092 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java
@@ -1,9 +1,14 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.datascope.DataScope;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 巡航预置点信息表 Mapper 接口
@@ -22,4 +27,11 @@
 
     Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId,
                                         @Param("cruiseName") String cruiseName);
+
+    List<BusObserpoiInfo> selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest);
+
+    List<BusObserpoiInfo> pageList(@Param("page")  Page<BusObserpoiInfo> page,
+                                   @Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest,
+                                   @Param("dataScope") DataScope dataScope);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
index 8b833e6..1c27890 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml
@@ -4,24 +4,25 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.casic.missiles.modular.system.model.BusObserpoiInfo">
-        <id column="ID" property="id" />
-        <result column="SERIAL_NAME" property="serialName" />
-        <result column="SERIAL_NUM" property="serialNum" />
-        <result column="DIRECTION" property="direction" />
-        <result column="PITCH" property="pitch" />
-        <result column="MONITOR_ID" property="monitorId" />
-        <result column="STOP_TIME" property="stopTime" />
-        <result column="ALARM_VALUE" property="alarmValue" />
-        <result column="SPEED" property="speed" />
-        <result column="LINE_NUM" property="lineNum" />
-        <result column="LINE_NAME" property="lineName" />
-        <result column="UPDATE_TIME" property="updateTime" />
-        <result column="TS" property="ts" />
+        <id column="ID" property="id"/>
+        <result column="SERIAL_NAME" property="serialName"/>
+        <result column="SERIAL_NUM" property="serialNum"/>
+        <result column="DIRECTION" property="direction"/>
+        <result column="PITCH" property="pitch"/>
+        <result column="MONITOR_ID" property="monitorId"/>
+        <result column="STOP_TIME" property="stopTime"/>
+        <result column="ALARM_VALUE" property="alarmValue"/>
+        <result column="SPEED" property="speed"/>
+        <result column="LINE_NUM" property="lineNum"/>
+        <result column="LINE_NAME" property="lineName"/>
+        <result column="UPDATE_TIME" property="updateTime"/>
+        <result column="TS" property="ts"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, SERIAL_NAME AS serialName, SERIAL_NUM AS serialNum, DIRECTION AS direction, PITCH AS pitch, MONITOR_ID AS monitorId, STOP_TIME AS stopTime, ALARM_VALUE AS alarmValue, SPEED AS speed, LINE_NUM AS lineNum, LINE_NAME AS lineName, UPDATE_TIME AS updateTime, TS AS ts
+        bo.ID
+        AS id, bo.SERIAL_NAME AS serialName, bo.SERIAL_NUM AS serialNum, bo.DIRECTION AS direction, bo.PITCH AS pitch, bo.MONITOR_ID AS monitorId, bo.STOP_TIME AS stopTime, bo.ALARM_VALUE AS alarmValue, bo.SPEED AS speed, bo.LINE_NUM AS lineNum, bo.LINE_NAME AS lineName,bo.UPDATE_TIME AS updateTime, bo.TS AS ts
     </sql>
     <select id="selectMaxNum" resultType="java.lang.Integer">
         select max(SERIAL_NUM)
@@ -43,4 +44,43 @@
             and LINE_NAME = #{cruiseName}
         </if>
     </select>
+
+    <select id="selectNoPage" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        bo.LINE_NUM as id,
+        bo.LINE_NAME as lineName
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.stationId != null and obserpoiRequest.stationId !=''">
+            and bm.STATION_ID = #{obserpoiRequest.stationId}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+    <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusObserpoiInfo">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM
+        bus_obserpoi_info bo
+        LEFT JOIN bus_monipoi_info bm ON bo.MONITOR_ID = bm.ID
+        LEFT JOIN bus_station_info bs ON bm.STATION_ID = bs.id
+        WHERE
+        bm.VALID = 0
+        AND bs.VALID =0
+        <if test="obserpoiRequest.lineNum != null and obserpoiRequest.lineNum !=''">
+            and bm.LINE_NUM = #{lineNum}
+        </if>
+        <if test="obserpoiRequest.monitorId != null and obserpoiRequest.monitorId !=''">
+            and bm.ID = #{obserpoiRequest.monitorId}
+        </if>
+    </select>
+
+
+
 </mapper>
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
new file mode 100644
index 0000000..bf8ba12
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiRequest.java
@@ -0,0 +1,27 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiRequest {
+
+
+    //场站Id
+    private Long stationId;
+
+
+    // 	监控点Id
+    private Long monitorId;
+
+    // 	路线编号
+    private Long lineNum;
+
+    public BusObserpoiRequest() {
+    }
+
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
new file mode 100644
index 0000000..8e2ce2b
--- /dev/null
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/BusObserpoiResponse.java
@@ -0,0 +1,37 @@
+package com.casic.missiles.modular.system.dto;
+
+
+import lombok.Data;
+
+/**
+ * @author zt
+ */
+@Data
+public class BusObserpoiResponse {
+
+
+    //预置点id
+    private Long id;
+    // 	线路编号
+    private Long lineNum;
+    // 	预置点编号名称
+    private String serialName;
+    // 	线路编号名称
+    private String lineName;
+    // 	方位角
+    private String direction;
+    // 	俯仰角
+    private String pitch;
+    // 	巡航速度
+    private String speed;
+    // 	停留时间
+    private String stopTime;
+    // 	报警阈值
+    private String alarmValue;
+    // 	创建时间
+    private String createTime;
+    // 	修改时间
+    private String updateTime;
+
+
+}
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
index 9389234..cf72272 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusObserpoiInfoService.java
@@ -1,5 +1,7 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -44,4 +46,9 @@
 
     boolean deleteCruise(String deviceIp, String cruiseName,int cruiseRoute );
 
+
+    List<BusObserpoiInfo> selectNoPage(BusObserpoiRequest obserpoiDTO);
+
+    List<BusObserpoiInfo>  pageList(Page<BusObserpoiInfo> page, BusObserpoiRequest obserpoiRequest);
+
 }
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
index 13c646c..5ea4c38 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusObserpoiInfoServiceImpl.java
@@ -2,8 +2,12 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.modular.system.dao.BusObserpoiInfoMapper;
+import com.casic.missiles.modular.system.dto.BusObserpoiRequest;
 import com.casic.missiles.modular.system.dto.MonitorBaseInfo;
 import com.casic.missiles.modular.system.model.BusObserpoiInfo;
 import com.casic.missiles.modular.system.service.IBusMonipoiInfoService;
@@ -27,6 +31,9 @@
     @Autowired
     private IBusMonipoiInfoService monipoiInfoService;
 
+    @Autowired
+    private AbstractPermissionContext permissionContext;
+
     @Override
     public BusObserpoiInfo selectByMonitorAndNum(Long monitorId, Integer serialNum, Integer lineNum) {
         QueryWrapper<BusObserpoiInfo> query = new QueryWrapper<>();
@@ -215,4 +222,17 @@
         }
         return false;
     }
+
+    @Override
+    public List<BusObserpoiInfo> selectNoPage(BusObserpoiRequest obserpoiRequest) {
+        return this.baseMapper.selectNoPage(obserpoiRequest);
+    }
+
+    @Override
+    public List<BusObserpoiInfo> pageList(Page<BusObserpoiInfo> page, BusObserpoiRequest obserpoiRequest) {
+
+        DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope();
+        dataScope.setScopeName("DEPT_ID");
+        return this.baseMapper.pageList(page,obserpoiRequest,dataScope);
+    }
 }