diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index 661c5d3..b80fda1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -78,8 +78,6 @@
             save(newAlarmRule);
         }
     }
-
-
     @Override
     public AlarmRule selectByMonitor(Long monitorId) {
         return this.getById(monitorId);

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index 661c5d3..b80fda1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -78,8 +78,6 @@
             save(newAlarmRule);
         }
     }
-
-
     @Override
     public AlarmRule selectByMonitor(Long monitorId) {
         return this.getById(monitorId);
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 860cfff..2821bd4 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
@@ -20,5 +20,5 @@
 
     List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
                                    @Param("busPlan") BusPlan busPlan,
-                                   @Param("dataScope") DataScope dataScope);
+                                   @Param("scope") DataScope dataScope);
 }

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index 661c5d3..b80fda1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -78,8 +78,6 @@
             save(newAlarmRule);
         }
     }
-
-
     @Override
     public AlarmRule selectByMonitor(Long monitorId) {
         return this.getById(monitorId);
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 860cfff..2821bd4 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
@@ -20,5 +20,5 @@
 
     List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
                                    @Param("busPlan") BusPlan busPlan,
-                                   @Param("dataScope") DataScope dataScope);
+                                   @Param("scope") 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 5ce849f..6b1d659 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
@@ -23,11 +23,11 @@
     </sql>
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
         SELECT
-        <include refid="Base_Column_List"/>,monitorName,DEPT_ID,lineName
+        <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
         bus_plan bp
         JOIN (
-            SELECT line_name AS  lineName,monitor_id
+            SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
             WHERE 1=1
             <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
@@ -36,11 +36,11 @@
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
-        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineName
+        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineNum
         JOIN (
             SELECT MONITOR_NAME AS  monitorName,station_id,id
             FROM bus_monipoi_info
-            WHERE VALID=1
+            WHERE VALID=0
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
@@ -48,7 +48,7 @@
         JOIN(
             SELECT DEPT_ID,id
             FROM bus_station_info
-            WHERE VALID=1
+            WHERE VALID=0
         )bsi ON bsi.id=bmi.station_id
         WHERE 1=1
         <if test="busPlan.lineNum != null and busPlan.lineNum !=''">

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index 661c5d3..b80fda1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -78,8 +78,6 @@
             save(newAlarmRule);
         }
     }
-
-
     @Override
     public AlarmRule selectByMonitor(Long monitorId) {
         return this.getById(monitorId);
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 860cfff..2821bd4 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
@@ -20,5 +20,5 @@
 
     List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
                                    @Param("busPlan") BusPlan busPlan,
-                                   @Param("dataScope") DataScope dataScope);
+                                   @Param("scope") 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 5ce849f..6b1d659 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
@@ -23,11 +23,11 @@
     </sql>
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
         SELECT
-        <include refid="Base_Column_List"/>,monitorName,DEPT_ID,lineName
+        <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
         bus_plan bp
         JOIN (
-            SELECT line_name AS  lineName,monitor_id
+            SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
             WHERE 1=1
             <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
@@ -36,11 +36,11 @@
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
-        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineName
+        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineNum
         JOIN (
             SELECT MONITOR_NAME AS  monitorName,station_id,id
             FROM bus_monipoi_info
-            WHERE VALID=1
+            WHERE VALID=0
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
@@ -48,7 +48,7 @@
         JOIN(
             SELECT DEPT_ID,id
             FROM bus_station_info
-            WHERE VALID=1
+            WHERE VALID=0
         )bsi ON bsi.id=bmi.station_id
         WHERE 1=1
         <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index ae9ae62..e60720c 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -53,10 +53,10 @@
 
     <select id="monitorListPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,stationName
         FROM bus_monipoi_info
         JOIN (
-            SELECT  id as idd,DEPT_ID
+            SELECT  id as idd,DEPT_ID,STATION_NAME AS stationName
             FROM bus_station_info
             WHERE valid=0
         )bsi  ON bsi.idd=station_id

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index 661c5d3..b80fda1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -78,8 +78,6 @@
             save(newAlarmRule);
         }
     }
-
-
     @Override
     public AlarmRule selectByMonitor(Long monitorId) {
         return this.getById(monitorId);
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 860cfff..2821bd4 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
@@ -20,5 +20,5 @@
 
     List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
                                    @Param("busPlan") BusPlan busPlan,
-                                   @Param("dataScope") DataScope dataScope);
+                                   @Param("scope") 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 5ce849f..6b1d659 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
@@ -23,11 +23,11 @@
     </sql>
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
         SELECT
-        <include refid="Base_Column_List"/>,monitorName,DEPT_ID,lineName
+        <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
         bus_plan bp
         JOIN (
-            SELECT line_name AS  lineName,monitor_id
+            SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
             WHERE 1=1
             <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
@@ -36,11 +36,11 @@
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
-        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineName
+        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineNum
         JOIN (
             SELECT MONITOR_NAME AS  monitorName,station_id,id
             FROM bus_monipoi_info
-            WHERE VALID=1
+            WHERE VALID=0
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
@@ -48,7 +48,7 @@
         JOIN(
             SELECT DEPT_ID,id
             FROM bus_station_info
-            WHERE VALID=1
+            WHERE VALID=0
         )bsi ON bsi.id=bmi.station_id
         WHERE 1=1
         <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index ae9ae62..e60720c 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -53,10 +53,10 @@
 
     <select id="monitorListPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,stationName
         FROM bus_monipoi_info
         JOIN (
-            SELECT  id as idd,DEPT_ID
+            SELECT  id as idd,DEPT_ID,STATION_NAME AS stationName
             FROM bus_station_info
             WHERE valid=0
         )bsi  ON bsi.idd=station_id
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
index fcc4a3b..6909619 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
@@ -39,7 +39,7 @@
     /**
      * 设备状态(字典)
      */
-    @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_TYPE)
+    @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_STATUS)
     private String deviceStatus;
 
     /**

diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
index 661c5d3..b80fda1 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java
@@ -78,8 +78,6 @@
             save(newAlarmRule);
         }
     }
-
-
     @Override
     public AlarmRule selectByMonitor(Long monitorId) {
         return this.getById(monitorId);
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 860cfff..2821bd4 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
@@ -20,5 +20,5 @@
 
     List<BusPlan> pageList(@Param("page") Page<BusPlan> page,
                                    @Param("busPlan") BusPlan busPlan,
-                                   @Param("dataScope") DataScope dataScope);
+                                   @Param("scope") 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 5ce849f..6b1d659 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
@@ -23,11 +23,11 @@
     </sql>
     <select id="pageList" resultType="com.casic.missiles.modular.system.model.BusPlan">
         SELECT
-        <include refid="Base_Column_List"/>,monitorName,DEPT_ID,lineName
+        <include refid="Base_Column_List"/>,monitorName,dept_id,lineName
         FROM
         bus_plan bp
         JOIN (
-            SELECT line_name AS  lineName,monitor_id
+            SELECT line_name AS  lineName,monitor_id,LINE_NUM as lineNum
             FROM bus_obserpoi_info
             WHERE 1=1
             <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
@@ -36,11 +36,11 @@
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
-        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineName
+        )boi ON bp.monitor_id=boi.monitor_id AND bp.LINE_NUM=boi.lineNum
         JOIN (
             SELECT MONITOR_NAME AS  monitorName,station_id,id
             FROM bus_monipoi_info
-            WHERE VALID=1
+            WHERE VALID=0
             <if test="busPlan.monitorId != null and busPlan.monitorId !=''">
                 and MONITOR_ID = #{busPlan.monitorId}
             </if>
@@ -48,7 +48,7 @@
         JOIN(
             SELECT DEPT_ID,id
             FROM bus_station_info
-            WHERE VALID=1
+            WHERE VALID=0
         )bsi ON bsi.id=bmi.station_id
         WHERE 1=1
         <if test="busPlan.lineNum != null and busPlan.lineNum !=''">
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
index ae9ae62..e60720c 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml
@@ -53,10 +53,10 @@
 
     <select id="monitorListPage" resultType="com.casic.missiles.modular.system.model.BusMonipoiInfo">
         SELECT
-        <include refid="Base_Column_List"/>
+        <include refid="Base_Column_List"/>,stationName
         FROM bus_monipoi_info
         JOIN (
-            SELECT  id as idd,DEPT_ID
+            SELECT  id as idd,DEPT_ID,STATION_NAME AS stationName
             FROM bus_station_info
             WHERE valid=0
         )bsi  ON bsi.idd=station_id
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
index fcc4a3b..6909619 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/monitor/MonitorOverviewMap.java
@@ -39,7 +39,7 @@
     /**
      * 设备状态(字典)
      */
-    @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_TYPE)
+    @DictCodeField(message = "设备类型描述不合法", cacheName = DictEnum.DEVICE_STATUS)
     private String deviceStatus;
 
     /**
diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
index bc6d094..76500b7 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/model/BusMonipoiInfo.java
@@ -40,6 +40,9 @@
      */
     @TableField("STATION_ID")
     private Long stationId;
+
+    @TableField(exist = false)
+    private String stationName;
     /**
      * 精确位置信息
      */