diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 5f672d8..92d8264 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -28,8 +28,6 @@
 
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
-    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
-
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }

diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
index 5f672d8..92d8264 100644
--- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
+++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java
@@ -28,8 +28,6 @@
 
     MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp);
 
-    List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope);
-
     BusMonipoiInfoResponse monitorDetail(@Param("id") Long id);
     List<MonitorOverviewMap> overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword);
 }
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 f63a319..f0a2054 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
@@ -85,26 +85,13 @@
     </select>
 
     <select id="overviewMap" resultType="com.casic.missiles.modular.system.dto.monitor.MonitorOverviewMap">
-        SELECT id            AS monitorId,
-               monitor_name  AS monitorName,
-               longitude,
-               latitude,
-               station_name  AS stationName,
-               location,
-               device_status AS deviceStatus
-        FROM (
-                 SELECT *
-                 FROM bus_monipoi_info
-                 WHERE valid = 0
-             ) bmi
-                 JOIN (
         SELECT id AS monitorId,
-                monitor_name AS monitorName,
-                longitude,
-                latitude,
-                station_name AS stationName,
-                location,
-                device_status AS deviceStatus
+        monitor_name AS monitorName,
+        longitude,
+        latitude,
+        station_name AS stationName,
+        location,
+        device_status AS deviceStatus
         FROM
         (
             SELECT * FROM bus_monipoi_info
@@ -113,20 +100,19 @@
                 and monitor_name like concat('%',#{keyword},'%')
             </if>
         ) bmi JOIN (
-            SELECT id AS idd, DEPT_ID, station_name
-            FROM bus_station_info
-            WHERE valid = 0
+        SELECT id AS idd, DEPT_ID, station_name
+        FROM bus_station_info
+        WHERE valid = 0
+        <if test="keyword!= null and keyword !=''">
+            and STATION_NAME like concat('%',#{keyword},'%')
+        </if>
         ) bsi ON bsi.idd = bmi.station_id
-            <if test="keyword!= null and keyword !=''">
-                and STATION_NAME like concat('%',#{keyword},'%')
-            </if>
-        ) bsi ON bsi.idd = bmi.station_id
+
     </select>
 
 
     <select id="monitorDetail" resultType="com.casic.missiles.modular.system.dto.monitor.BusMonipoiInfoResponse">
-        SELECT
-               bi.id               AS id,
+        SELECT bi.id            AS id,
                MONITOR_NAME     AS monitorName,
                STATION_ID       AS stationId,
                LOCATION         AS location,
@@ -149,9 +135,9 @@
                DEVICE_STATUS    AS deviceStatus,
                LINE_NUM         AS lineNum,
                PRESET_INTERVAL  AS presetInterval,
-               bi.VALID            AS valid,
-               bi.SETUP_DATE       AS setupDate,
-               bi.TS               AS ts,
+               bi.VALID         AS valid,
+               bi.SETUP_DATE    AS setupDate,
+               bi.TS            AS ts,
                ar.ANGLE         AS angle,
                ar.HIGH          AS high,
                ar.SPEED         AS speed,