diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
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);
+    }
 
     /**
      * 获取闸井详情

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
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);
+    }
 
     /**
      * 获取闸井详情
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 494ad07..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -49,50 +49,111 @@
         </profile>
     </profiles>
     <dependencies>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.7</version>
+        </dependency>
         <!--casic基础包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-core</artifactId>
             <version>${core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-support</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.72</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-area</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-sluicewell</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-analysis</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-alarm</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -158,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
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);
+    }
 
     /**
      * 获取闸井详情
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 494ad07..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -49,50 +49,111 @@
         </profile>
     </profiles>
     <dependencies>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.7</version>
+        </dependency>
         <!--casic基础包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-core</artifactId>
             <version>${core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-support</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.72</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-area</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-sluicewell</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-analysis</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-alarm</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -158,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index bc4b4dc..c61f36e 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -57,7 +57,6 @@
             e.printStackTrace();
         }
 
-
         UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
         token.setRememberMe(false);
         try {
@@ -70,7 +69,6 @@
         super.getSession().setAttribute("username", shiroUser.getAccount());
 
         super.getSession().setAttribute(PermissionContant.SESSION_KEY, shiroUser.getId());
-
         LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
 
         ShiroKit.getSession().setAttribute("sessionFlag", true);

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
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);
+    }
 
     /**
      * 获取闸井详情
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 494ad07..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -49,50 +49,111 @@
         </profile>
     </profiles>
     <dependencies>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.7</version>
+        </dependency>
         <!--casic基础包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-core</artifactId>
             <version>${core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-support</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.72</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-area</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-sluicewell</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-analysis</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-alarm</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -158,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index bc4b4dc..c61f36e 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -57,7 +57,6 @@
             e.printStackTrace();
         }
 
-
         UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
         token.setRememberMe(false);
         try {
@@ -70,7 +69,6 @@
         super.getSession().setAttribute("username", shiroUser.getAccount());
 
         super.getSession().setAttribute(PermissionContant.SESSION_KEY, shiroUser.getId());
-
         LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
 
         ShiroKit.getSession().setAttribute("sessionFlag", true);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 223ade1..5fe056c 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -5,9 +5,9 @@
  resources:
    static-locations: file:D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\,file:D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
  datasource:
-    url: jdbc:mysql://localhost:3306/smartwell_yizhuang?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false
     username: root
-    password: root
+    password: Casic203!
     initial-size: 2
     min-idle: 1
  jms:

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
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);
+    }
 
     /**
      * 获取闸井详情
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 494ad07..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -49,50 +49,111 @@
         </profile>
     </profiles>
     <dependencies>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.7</version>
+        </dependency>
         <!--casic基础包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-core</artifactId>
             <version>${core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-support</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.72</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-area</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-sluicewell</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-analysis</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-alarm</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -158,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index bc4b4dc..c61f36e 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -57,7 +57,6 @@
             e.printStackTrace();
         }
 
-
         UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
         token.setRememberMe(false);
         try {
@@ -70,7 +69,6 @@
         super.getSession().setAttribute("username", shiroUser.getAccount());
 
         super.getSession().setAttribute(PermissionContant.SESSION_KEY, shiroUser.getId());
-
         LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
 
         ShiroKit.getSession().setAttribute("sessionFlag", true);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 223ade1..5fe056c 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -5,9 +5,9 @@
  resources:
    static-locations: file:D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\,file:D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
  datasource:
-    url: jdbc:mysql://localhost:3306/smartwell_yizhuang?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false
     username: root
-    password: root
+    password: Casic203!
     initial-size: 2
     min-idle: 1
  jms:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 720bc97..2f19dc6 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: @activatedProperties@
+    active: prod
   http:
     multipart:
       max-file-size: 50MB
@@ -39,6 +39,7 @@
 casic:
   swagger-open: false #是否开启swagger (true/false)
   kaptcha-open: true #是否开启登录时验证码 (true/false)
+  markChPwdDate: true #是否记录密码变更时间
   file-upload-path: d:/tmp  #文件上传目录(不配置的话为java.io.tmpdir目录)
   muti-datasource-open: false #是否开启多数据源(true/false)
   spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index a3ffd67..10f6d8f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -78,7 +78,15 @@
     private IDeviceTypeService deviceTypeService;
     @Autowired
     private IDeviceModelsService deviceModelsService;
-
+    @ApiOperation("获取设备列表")
+    @RequestMapping(value = "/listPage")
+    @ResponseBody
+    public Object listPage() {
+        Page<Device> page = new PageFactory<Device>().defaultPage();
+        EntityWrapper query = new EntityWrapper();
+        query.eq("id",0);
+        return ResponseData.success( super.packForBT(deviceService.selectPage(page,query)));
+    }
     @ApiOperation("获取设备列表")
     @RequestMapping(value = "/list")
     @ResponseBody
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 4b30a27..5061612 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -370,10 +370,10 @@
                 and bwi.DEPTID = #{deptid}
             </if>
             <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME &gt;<include refid="begintime_sql"/>
+                and dwl.LOGTIME &gt;<include refid="begintime_sql"/>
             </if>
             <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME &lt;
+                and dwl.LOGTIME &lt;
                 <include refid="endtime_sql"/>
             </if>
             <if test="keywords != null and keywords !=''">
@@ -384,7 +384,7 @@
                 )
             </if>
         </where>
-        ORDER BY dwl.UPTIME DESC
+        ORDER BY dwl.LOGTIME DESC
     </select>
 
     <select id="selectMeterDataScopePage" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
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);
+    }
 
     /**
      * 获取闸井详情
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 494ad07..a64d1e5 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -49,50 +49,111 @@
         </profile>
     </profiles>
     <dependencies>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+            <version>3.5.7</version>
+        </dependency>
         <!--casic基础包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-core</artifactId>
             <version>${core.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.shiro</groupId>
+                    <artifactId>shiro-core</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-support</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.72</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-core</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-admin-area</artifactId>
             <version>${admin.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--子项目包依赖-->
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-device</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-sluicewell</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-analysis</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.casic</groupId>
             <artifactId>casic-alarm</artifactId>
             <version>${pro.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
-
         <!--spring boot依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -158,7 +219,7 @@
             <groupId>org.ehcache</groupId>
             <artifactId>ehcache</artifactId>
         </dependency>
-        <!--   需要分布式session的话需要放开注释
+        <!--需要分布式session的话需要放开注释
             <dependency>
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session</artifactId>
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index bc4b4dc..c61f36e 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -57,7 +57,6 @@
             e.printStackTrace();
         }
 
-
         UsernamePasswordToken token = new UsernamePasswordToken(username, password.toCharArray());
         token.setRememberMe(false);
         try {
@@ -70,7 +69,6 @@
         super.getSession().setAttribute("username", shiroUser.getAccount());
 
         super.getSession().setAttribute(PermissionContant.SESSION_KEY, shiroUser.getId());
-
         LogManager.me().executeLog(LogTaskFactory.loginLog(shiroUser.getId(), getIp()));
 
         ShiroKit.getSession().setAttribute("sessionFlag", true);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 223ade1..5fe056c 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -5,9 +5,9 @@
  resources:
    static-locations: file:D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\,file:D:\java\boot\guns-web-1.0.0-SNAPSHOT\download\
  datasource:
-    url: jdbc:mysql://localhost:3306/smartwell_yizhuang?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false
+    url: jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false
     username: root
-    password: root
+    password: Casic203!
     initial-size: 2
     min-idle: 1
  jms:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 720bc97..2f19dc6 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: @activatedProperties@
+    active: prod
   http:
     multipart:
       max-file-size: 50MB
@@ -39,6 +39,7 @@
 casic:
   swagger-open: false #是否开启swagger (true/false)
   kaptcha-open: true #是否开启登录时验证码 (true/false)
+  markChPwdDate: true #是否记录密码变更时间
   file-upload-path: d:/tmp  #文件上传目录(不配置的话为java.io.tmpdir目录)
   muti-datasource-open: false #是否开启多数据源(true/false)
   spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
diff --git a/pom.xml b/pom.xml
index 63cd85c..cf72f1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,9 +36,9 @@
         <office.version>1.0.0.alpha</office.version>
 
         <mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version>
-        <shiro.version>1.7.0</shiro.version>
+        <shiro.version>1.12.0</shiro.version>
         <mybatis-plus.version>2.1.8</mybatis-plus.version>
-        <fastjson.version>1.2.44</fastjson.version>
+        <fastjson.version>1.2.72</fastjson.version>
         <commons.io.version>2.5</commons.io.version>
         <velocity.version>1.7</velocity.version>
         <kaptcha.version>2.3.2</kaptcha.version>
@@ -76,6 +76,12 @@
                 <groupId>com.baomidou</groupId>
                 <artifactId>mybatisplus-spring-boot-starter</artifactId>
                 <version>${mybatisplus-spring-boot-starter.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.mybatis</groupId>
+                        <artifactId>mybatis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <!--shiro依赖-->
             <dependency>