diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 7a21b6c..49dbabb 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -23,6 +23,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 地图总览模块的controller
@@ -86,6 +87,47 @@
         return ResponseData.success(wellList);
     }
 
+    /**
+     * 返回不告警的井用于地图显示---新增
+     */
+    @RequestMapping(value = "/wellListDisplay")
+    @ResponseBody
+    public Object wellListDisplay(@RequestParam(required = false) String keywords,
+                                  @RequestParam(required = false) String wellType,
+                                  @RequestParam(required = false) String deptid,
+                                  @RequestParam(required = false) String isAlarm) {
+
+        DataScope dataScope = permissionService.getCurrUserDataScope();
+        List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
+
+        if (null == isAlarm || isAlarm.equals("") == true) {
+            // isAlarm参数为空，查询所有的闸井
+
+            // 查询并添加当前部门的闸井
+            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
+            if (null != myList && myList.isEmpty() == false) {
+                wellList.addAll(myList);
+            }
+        } else if (isAlarm.equals("1")) {
+            // isAlarm = 1 查询所有报警状态的闸井
+            wellList = busWellInfoService.getAlarmWellList(dataScope, keywords, wellType, deptid);
+        } else {
+            // isAlarm = 0 查询所有不是报警状态的闸井
+            wellList = busWellInfoService.getNotAlarmWellList(dataScope, keywords, wellType, deptid);
+        }
+        List<Map<String,Object>> mapList= new ArrayList<>();
+        for(BusWellInfoDto busWellInfoDto:wellList){
+            Map<String,Object> map = new HashMap<>();
+            map.put("id",busWellInfoDto.getId());
+            map.put("coordinateX",busWellInfoDto.getCoordinateX());
+            map.put("coordinateY",busWellInfoDto.getCoordinateY());
+            map.put("coordinateY",busWellInfoDto.getCoordinateY());
+            map.put("wellCode",busWellInfoDto.getWellCode());
+            mapList.add(map);
+        }
+        getHttpServletResponse().setBufferSize(4096);
+        return ResponseData.success(mapList);
+    }
 
     /**
      * 获取闸井详情