diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 5214dfe..c00306e 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
 import com.casic.missiles.modular.app.dto.SelectDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
 import com.casic.missiles.modular.app.model.BatchExportLog;
@@ -22,6 +23,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,6 +84,7 @@
     /**
      * 新增施工添加设备
      */
+    @Transactional
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
@@ -316,4 +319,19 @@
     }
 
 
+    /***
+     * 施工app安装井盖用
+     * @param
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppWellList")
+    @ResponseBody
+    public Object getAppWellList(String wellCode, String position,String wellType) {
+
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+    }
+
+
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 5214dfe..c00306e 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
 import com.casic.missiles.modular.app.dto.SelectDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
 import com.casic.missiles.modular.app.model.BatchExportLog;
@@ -22,6 +23,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,6 +84,7 @@
     /**
      * 新增施工添加设备
      */
+    @Transactional
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
@@ -316,4 +319,19 @@
     }
 
 
+    /***
+     * 施工app安装井盖用
+     * @param
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppWellList")
+    @ResponseBody
+    public Object getAppWellList(String wellCode, String position,String wellType) {
+
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+    }
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index b8d5b31..ba6dc28 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,9 @@
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
 
+    List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
+                                    @Param("position") String position,
+                                    @Param("wellType") String wellType);
+
+
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 5214dfe..c00306e 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
 import com.casic.missiles.modular.app.dto.SelectDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
 import com.casic.missiles.modular.app.model.BatchExportLog;
@@ -22,6 +23,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,6 +84,7 @@
     /**
      * 新增施工添加设备
      */
+    @Transactional
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
@@ -316,4 +319,19 @@
     }
 
 
+    /***
+     * 施工app安装井盖用
+     * @param
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppWellList")
+    @ResponseBody
+    public Object getAppWellList(String wellCode, String position,String wellType) {
+
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+    }
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index b8d5b31..ba6dc28 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,9 @@
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
 
+    List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
+                                    @Param("position") String position,
+                                    @Param("wellType") String wellType);
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 5621363..08db860 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -39,8 +39,43 @@
 
     <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
         SELECT
-            b.DEVCODE as devCode,
-            b.DEVICE_NAME as deviceName,
+        b.DEVCODE as devCode,
+        b.DEVICE_NAME as deviceName,
+        w.WELL_CODE as wellCode,
+        w.COORDINATE_X as coordinateX,
+        w.COORDINATE_y as coordinateY,
+        w.LAT_GAODE as latGaode,
+        w.LNG_GAODE as lngGaode,
+        w.POSITION as position,
+        w.WELL_TYPE as wellType,
+        w.DEPTID as deptId
+        FROM
+        bus_device b
+        JOIN bus_device_well d ON b.ID = d.DEVICE_ID
+        JOIN bus_well_info w ON w.ID = d.WELL_ID
+        WHERE
+        b.VALID = 1
+        <if test="devCode != null and devCode != '' ">
+            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
+        </if>
+        <if test="wellCode != null and wellCode != '' ">
+            and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
+        </if>
+        <if test="position != null and position != '' ">
+            and  w.POSITION like CONCAT('%',#{position}, '%')
+        </if>
+        <if test="wellType != null and wellType != '' ">
+            and w.WELL_TYPE in
+            <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+        </if>
+    </select>
+
+
+    <select id="getAppWellList" resultType="com.casic.missiles.modular.app.dto.WellAppDTO">
+        SELECT
+
             w.WELL_CODE as wellCode,
             w.COORDINATE_X as coordinateX,
             w.COORDINATE_y as coordinateY,
@@ -48,16 +83,13 @@
             w.LNG_GAODE as lngGaode,
             w.POSITION as position,
             w.WELL_TYPE as wellType,
+            w.BFZT as isInStall,
 	        w.DEPTID as deptId
         FROM
-            bus_device b
-             JOIN bus_device_well d ON b.ID = d.DEVICE_ID
-             JOIN bus_well_info w ON w.ID = d.WELL_ID
+            bus_well_info w
         WHERE
-            b.VALID = 1
-        <if test="devCode != null and devCode != '' ">
-            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
-        </if>
+            w.VALID = '1'
+
         <if test="wellCode != null and wellCode != '' ">
             and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
         </if>

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 5214dfe..c00306e 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
 import com.casic.missiles.modular.app.dto.SelectDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
 import com.casic.missiles.modular.app.model.BatchExportLog;
@@ -22,6 +23,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,6 +84,7 @@
     /**
      * 新增施工添加设备
      */
+    @Transactional
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
@@ -316,4 +319,19 @@
     }
 
 
+    /***
+     * 施工app安装井盖用
+     * @param
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppWellList")
+    @ResponseBody
+    public Object getAppWellList(String wellCode, String position,String wellType) {
+
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+    }
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index b8d5b31..ba6dc28 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,9 @@
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
 
+    List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
+                                    @Param("position") String position,
+                                    @Param("wellType") String wellType);
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 5621363..08db860 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -39,8 +39,43 @@
 
     <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
         SELECT
-            b.DEVCODE as devCode,
-            b.DEVICE_NAME as deviceName,
+        b.DEVCODE as devCode,
+        b.DEVICE_NAME as deviceName,
+        w.WELL_CODE as wellCode,
+        w.COORDINATE_X as coordinateX,
+        w.COORDINATE_y as coordinateY,
+        w.LAT_GAODE as latGaode,
+        w.LNG_GAODE as lngGaode,
+        w.POSITION as position,
+        w.WELL_TYPE as wellType,
+        w.DEPTID as deptId
+        FROM
+        bus_device b
+        JOIN bus_device_well d ON b.ID = d.DEVICE_ID
+        JOIN bus_well_info w ON w.ID = d.WELL_ID
+        WHERE
+        b.VALID = 1
+        <if test="devCode != null and devCode != '' ">
+            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
+        </if>
+        <if test="wellCode != null and wellCode != '' ">
+            and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
+        </if>
+        <if test="position != null and position != '' ">
+            and  w.POSITION like CONCAT('%',#{position}, '%')
+        </if>
+        <if test="wellType != null and wellType != '' ">
+            and w.WELL_TYPE in
+            <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+        </if>
+    </select>
+
+
+    <select id="getAppWellList" resultType="com.casic.missiles.modular.app.dto.WellAppDTO">
+        SELECT
+
             w.WELL_CODE as wellCode,
             w.COORDINATE_X as coordinateX,
             w.COORDINATE_y as coordinateY,
@@ -48,16 +83,13 @@
             w.LNG_GAODE as lngGaode,
             w.POSITION as position,
             w.WELL_TYPE as wellType,
+            w.BFZT as isInStall,
 	        w.DEPTID as deptId
         FROM
-            bus_device b
-             JOIN bus_device_well d ON b.ID = d.DEVICE_ID
-             JOIN bus_well_info w ON w.ID = d.WELL_ID
+            bus_well_info w
         WHERE
-            b.VALID = 1
-        <if test="devCode != null and devCode != '' ">
-            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
-        </if>
+            w.VALID = '1'
+
         <if test="wellCode != null and wellCode != '' ">
             and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
         </if>
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java
new file mode 100644
index 0000000..b14a5ad
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.app.dto;
+
+import lombok.Data;
+
+@Data
+public class WellAppDTO {
+    private  String wellCode;
+    private  String coordinateX;
+    private  String coordinateY;
+    private  String latGaode;
+    private  String lngGaode;
+    private  String position;
+    private  String deptId;
+    private  String wellType;
+    //1:已安装，0:未安装
+    private  String isInStall;
+}

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 5214dfe..c00306e 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
 import com.casic.missiles.modular.app.dto.SelectDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
 import com.casic.missiles.modular.app.model.BatchExportLog;
@@ -22,6 +23,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,6 +84,7 @@
     /**
      * 新增施工添加设备
      */
+    @Transactional
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
@@ -316,4 +319,19 @@
     }
 
 
+    /***
+     * 施工app安装井盖用
+     * @param
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppWellList")
+    @ResponseBody
+    public Object getAppWellList(String wellCode, String position,String wellType) {
+
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+    }
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index b8d5b31..ba6dc28 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,9 @@
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
 
+    List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
+                                    @Param("position") String position,
+                                    @Param("wellType") String wellType);
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 5621363..08db860 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -39,8 +39,43 @@
 
     <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
         SELECT
-            b.DEVCODE as devCode,
-            b.DEVICE_NAME as deviceName,
+        b.DEVCODE as devCode,
+        b.DEVICE_NAME as deviceName,
+        w.WELL_CODE as wellCode,
+        w.COORDINATE_X as coordinateX,
+        w.COORDINATE_y as coordinateY,
+        w.LAT_GAODE as latGaode,
+        w.LNG_GAODE as lngGaode,
+        w.POSITION as position,
+        w.WELL_TYPE as wellType,
+        w.DEPTID as deptId
+        FROM
+        bus_device b
+        JOIN bus_device_well d ON b.ID = d.DEVICE_ID
+        JOIN bus_well_info w ON w.ID = d.WELL_ID
+        WHERE
+        b.VALID = 1
+        <if test="devCode != null and devCode != '' ">
+            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
+        </if>
+        <if test="wellCode != null and wellCode != '' ">
+            and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
+        </if>
+        <if test="position != null and position != '' ">
+            and  w.POSITION like CONCAT('%',#{position}, '%')
+        </if>
+        <if test="wellType != null and wellType != '' ">
+            and w.WELL_TYPE in
+            <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+        </if>
+    </select>
+
+
+    <select id="getAppWellList" resultType="com.casic.missiles.modular.app.dto.WellAppDTO">
+        SELECT
+
             w.WELL_CODE as wellCode,
             w.COORDINATE_X as coordinateX,
             w.COORDINATE_y as coordinateY,
@@ -48,16 +83,13 @@
             w.LNG_GAODE as lngGaode,
             w.POSITION as position,
             w.WELL_TYPE as wellType,
+            w.BFZT as isInStall,
 	        w.DEPTID as deptId
         FROM
-            bus_device b
-             JOIN bus_device_well d ON b.ID = d.DEVICE_ID
-             JOIN bus_well_info w ON w.ID = d.WELL_ID
+            bus_well_info w
         WHERE
-            b.VALID = 1
-        <if test="devCode != null and devCode != '' ">
-            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
-        </if>
+            w.VALID = '1'
+
         <if test="wellCode != null and wellCode != '' ">
             and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
         </if>
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java
new file mode 100644
index 0000000..b14a5ad
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.app.dto;
+
+import lombok.Data;
+
+@Data
+public class WellAppDTO {
+    private  String wellCode;
+    private  String coordinateX;
+    private  String coordinateY;
+    private  String latGaode;
+    private  String lngGaode;
+    private  String position;
+    private  String deptId;
+    private  String wellType;
+    //1:已安装，0:未安装
+    private  String isInStall;
+}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
index be3a793..4ac9a45 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.BatchExportLog;
 import org.springframework.web.multipart.MultipartFile;
@@ -57,4 +58,6 @@
     Page<DeviceAppDTO> getAppDeviceList( Page<DeviceAppDTO> page, String devCode, String wellCode, String position,String wellType);
 
     boolean deleteByDevCode(String devCode);
+
+    List<WellAppDTO> getAppWellList( String wellCode, String position,String wellType);
 }

diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
index 5214dfe..c00306e 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/controller/AppDeviceAddController.java
@@ -12,6 +12,7 @@
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
 import com.casic.missiles.modular.app.dto.SelectDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
 import com.casic.missiles.modular.app.model.BatchExportLog;
@@ -22,6 +23,7 @@
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -82,6 +84,7 @@
     /**
      * 新增施工添加设备
      */
+    @Transactional
     @RequestMapping(value = "/add")
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
@@ -316,4 +319,19 @@
     }
 
 
+    /***
+     * 施工app安装井盖用
+     * @param
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppWellList")
+    @ResponseBody
+    public Object getAppWellList(String wellCode, String position,String wellType) {
+
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+    }
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
index b8d5b31..ba6dc28 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/AppDeviceAddMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,4 +32,9 @@
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
 
+    List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
+                                    @Param("position") String position,
+                                    @Param("wellType") String wellType);
+
+
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
index 5621363..08db860 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dao/mapping/AppDeviceAddMapper.xml
@@ -39,8 +39,43 @@
 
     <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
         SELECT
-            b.DEVCODE as devCode,
-            b.DEVICE_NAME as deviceName,
+        b.DEVCODE as devCode,
+        b.DEVICE_NAME as deviceName,
+        w.WELL_CODE as wellCode,
+        w.COORDINATE_X as coordinateX,
+        w.COORDINATE_y as coordinateY,
+        w.LAT_GAODE as latGaode,
+        w.LNG_GAODE as lngGaode,
+        w.POSITION as position,
+        w.WELL_TYPE as wellType,
+        w.DEPTID as deptId
+        FROM
+        bus_device b
+        JOIN bus_device_well d ON b.ID = d.DEVICE_ID
+        JOIN bus_well_info w ON w.ID = d.WELL_ID
+        WHERE
+        b.VALID = 1
+        <if test="devCode != null and devCode != '' ">
+            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
+        </if>
+        <if test="wellCode != null and wellCode != '' ">
+            and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
+        </if>
+        <if test="position != null and position != '' ">
+            and  w.POSITION like CONCAT('%',#{position}, '%')
+        </if>
+        <if test="wellType != null and wellType != '' ">
+            and w.WELL_TYPE in
+            <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
+                '${item}'
+            </foreach>
+        </if>
+    </select>
+
+
+    <select id="getAppWellList" resultType="com.casic.missiles.modular.app.dto.WellAppDTO">
+        SELECT
+
             w.WELL_CODE as wellCode,
             w.COORDINATE_X as coordinateX,
             w.COORDINATE_y as coordinateY,
@@ -48,16 +83,13 @@
             w.LNG_GAODE as lngGaode,
             w.POSITION as position,
             w.WELL_TYPE as wellType,
+            w.BFZT as isInStall,
 	        w.DEPTID as deptId
         FROM
-            bus_device b
-             JOIN bus_device_well d ON b.ID = d.DEVICE_ID
-             JOIN bus_well_info w ON w.ID = d.WELL_ID
+            bus_well_info w
         WHERE
-            b.VALID = 1
-        <if test="devCode != null and devCode != '' ">
-            and b.DEVCODE like CONCAT('%',#{devCode}, '%')
-        </if>
+            w.VALID = '1'
+
         <if test="wellCode != null and wellCode != '' ">
             and w.WELL_CODE like CONCAT('%',#{wellCode}, '%')
         </if>
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java
new file mode 100644
index 0000000..b14a5ad
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/WellAppDTO.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.app.dto;
+
+import lombok.Data;
+
+@Data
+public class WellAppDTO {
+    private  String wellCode;
+    private  String coordinateX;
+    private  String coordinateY;
+    private  String latGaode;
+    private  String lngGaode;
+    private  String position;
+    private  String deptId;
+    private  String wellType;
+    //1:已安装，0:未安装
+    private  String isInStall;
+}
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
index be3a793..4ac9a45 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/IAppDeviceAddService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.IService;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.BatchExportLog;
 import org.springframework.web.multipart.MultipartFile;
@@ -57,4 +58,6 @@
     Page<DeviceAppDTO> getAppDeviceList( Page<DeviceAppDTO> page, String devCode, String wellCode, String position,String wellType);
 
     boolean deleteByDevCode(String devCode);
+
+    List<WellAppDTO> getAppWellList( String wellCode, String position,String wellType);
 }
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
index 22939b6..afba2d8 100644
--- a/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/service/impl/AppDeviceAddServiceImpl.java
@@ -2,7 +2,6 @@
 
 import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
-import cn.hutool.core.stream.CollectorUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
@@ -13,32 +12,34 @@
 import com.casic.missiles.modular.app.dao.BatchExportLogMapper;
 import com.casic.missiles.modular.app.dto.AppDevicAddDTO;
 import com.casic.missiles.modular.app.dto.DeviceAppDTO;
+import com.casic.missiles.modular.app.dto.WellAppDTO;
 import com.casic.missiles.modular.app.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.BatchExportLog;
 import com.casic.missiles.modular.app.service.IAppDeviceAddService;
 import com.casic.missiles.modular.app.util.*;
-import com.casic.missiles.modular.system.model.User;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.management.Query;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
-import java.io.*;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.util.*;
 import java.util.List;
-import java.util.concurrent.*;
+import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
 
 /**
@@ -449,6 +450,7 @@
     }
 
     private static Map<String, String> wellTypeHashMap = new HashMap<String, String>();
+
     static {
         wellTypeHashMap.put("1", "雨水井");
         wellTypeHashMap.put("2", "污水井");
@@ -470,9 +472,9 @@
     }
 
     @Override
-    public Page<DeviceAppDTO> getAppDeviceList(Page<DeviceAppDTO> page, String devCode, String wellCode, String position,String wellType) {
-        List<DeviceAppDTO> deviceAppDTOList = this.baseMapper.getAppDeviceList(page, devCode, wellCode, position,wellType);
-        for(DeviceAppDTO deviceAppDTO : deviceAppDTOList){
+    public Page<DeviceAppDTO> getAppDeviceList(Page<DeviceAppDTO> page, String devCode, String wellCode, String position, String wellType) {
+        List<DeviceAppDTO> deviceAppDTOList = this.baseMapper.getAppDeviceList(page, devCode, wellCode, position, wellType);
+        for (DeviceAppDTO deviceAppDTO : deviceAppDTOList) {
             deviceAppDTO.setWellType(wellTypeHashMap.get(deviceAppDTO.getWellType()));
         }
         page.setRecords(deviceAppDTOList);
@@ -483,4 +485,13 @@
     public boolean deleteByDevCode(String devCode) {
         return this.baseMapper.deleteByDevCode(devCode);
     }
+
+    @Override
+    public List<WellAppDTO> getAppWellList(String wellCode, String position, String wellType) {
+        List<WellAppDTO> wellAppDTOList = this.baseMapper.getAppWellList(wellCode, position, wellType);
+        for (WellAppDTO wellAppDTO : wellAppDTOList) {
+            wellAppDTO.setWellType(wellTypeHashMap.get(wellAppDTO.getWellType()));
+        }
+        return wellAppDTOList;
+    }
 }