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 4fdc66f..eaf5291 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
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.base.response.SuccessResponseData;
 import com.casic.missiles.core.common.annotion.BussinessLog;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.util.DateUtil;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
@@ -32,7 +33,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -287,4 +289,31 @@
         appDeviceAddService.batchDownloadFiles(recentDir, response);
     }
 
+    /***
+     * 施工app定位丢失井盖用
+     * @param devCode
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppDeviceList")
+    @ResponseBody
+    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+        Page<DeviceAppDTO> page = new PageFactory<DeviceAppDTO>().defaultPage();
+        page = appDeviceAddService.getAppDeviceList(page, devCode,wellCode,position,wellType);
+        return new SuccessResponseData(super.packForBT(page));
+    }
+
+    /***
+     * 施工app定位井盖找到后消除
+     * @param devCode
+     * @return
+     */
+    @RequestMapping(value = "/deleteByDevCode")
+    @ResponseBody
+    public Object deleteByDevCode(String devCode) {
+        return new SuccessResponseData(appDeviceAddService.deleteByDevCode(devCode));
+    }
+
+
 }

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 4fdc66f..eaf5291 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
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.base.response.SuccessResponseData;
 import com.casic.missiles.core.common.annotion.BussinessLog;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.util.DateUtil;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
@@ -32,7 +33,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -287,4 +289,31 @@
         appDeviceAddService.batchDownloadFiles(recentDir, response);
     }
 
+    /***
+     * 施工app定位丢失井盖用
+     * @param devCode
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppDeviceList")
+    @ResponseBody
+    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+        Page<DeviceAppDTO> page = new PageFactory<DeviceAppDTO>().defaultPage();
+        page = appDeviceAddService.getAppDeviceList(page, devCode,wellCode,position,wellType);
+        return new SuccessResponseData(super.packForBT(page));
+    }
+
+    /***
+     * 施工app定位井盖找到后消除
+     * @param devCode
+     * @return
+     */
+    @RequestMapping(value = "/deleteByDevCode")
+    @ResponseBody
+    public Object deleteByDevCode(String devCode) {
+        return new SuccessResponseData(appDeviceAddService.deleteByDevCode(devCode));
+    }
+
+
 }
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 18f1929..b8d5b31 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
@@ -1,9 +1,13 @@
 package com.casic.missiles.modular.app.dao;
 
 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.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -16,4 +20,15 @@
 
     String findModeCodeByCode(@Param("devcode") String devcode);
 
+
+    List<DeviceAppDTO> getAppDeviceList(@Param("page") Page<DeviceAppDTO> page,
+                                        @Param("devCode") String devCode,
+                                        @Param("wellCode") String wellCode,
+                                        @Param("position") String position,
+                                        @Param("wellType") String wellType);
+
+
+    boolean deleteByDevCode(@Param("devCode") String devCode);
+
+
 }

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 4fdc66f..eaf5291 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
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.base.response.SuccessResponseData;
 import com.casic.missiles.core.common.annotion.BussinessLog;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.util.DateUtil;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
@@ -32,7 +33,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -287,4 +289,31 @@
         appDeviceAddService.batchDownloadFiles(recentDir, response);
     }
 
+    /***
+     * 施工app定位丢失井盖用
+     * @param devCode
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppDeviceList")
+    @ResponseBody
+    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+        Page<DeviceAppDTO> page = new PageFactory<DeviceAppDTO>().defaultPage();
+        page = appDeviceAddService.getAppDeviceList(page, devCode,wellCode,position,wellType);
+        return new SuccessResponseData(super.packForBT(page));
+    }
+
+    /***
+     * 施工app定位井盖找到后消除
+     * @param devCode
+     * @return
+     */
+    @RequestMapping(value = "/deleteByDevCode")
+    @ResponseBody
+    public Object deleteByDevCode(String devCode) {
+        return new SuccessResponseData(appDeviceAddService.deleteByDevCode(devCode));
+    }
+
+
 }
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 18f1929..b8d5b31 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
@@ -1,9 +1,13 @@
 package com.casic.missiles.modular.app.dao;
 
 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.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -16,4 +20,15 @@
 
     String findModeCodeByCode(@Param("devcode") String devcode);
 
+
+    List<DeviceAppDTO> getAppDeviceList(@Param("page") Page<DeviceAppDTO> page,
+                                        @Param("devCode") String devCode,
+                                        @Param("wellCode") String wellCode,
+                                        @Param("position") String position,
+                                        @Param("wellType") String wellType);
+
+
+    boolean deleteByDevCode(@Param("devCode") String devCode);
+
+
 }
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 5f28602..65be321 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
@@ -35,4 +35,46 @@
         LEFT JOIN product_device_type pdt ON  pd.`devtype_id`=pdt.`id`
         WHERE pd.`devcode`= #{devcode} LIMIT 1
     </select>
+
+
+    <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
+        SELECT
+            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>
+
+    <update id="deleteByDevCode">
+        UPDATE bus_device set VALID = 0
+        WHERE DEVCODE= #{devCode}
+    </update>
+
 </mapper>

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 4fdc66f..eaf5291 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
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.base.response.SuccessResponseData;
 import com.casic.missiles.core.common.annotion.BussinessLog;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.util.DateUtil;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
@@ -32,7 +33,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -287,4 +289,31 @@
         appDeviceAddService.batchDownloadFiles(recentDir, response);
     }
 
+    /***
+     * 施工app定位丢失井盖用
+     * @param devCode
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppDeviceList")
+    @ResponseBody
+    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+        Page<DeviceAppDTO> page = new PageFactory<DeviceAppDTO>().defaultPage();
+        page = appDeviceAddService.getAppDeviceList(page, devCode,wellCode,position,wellType);
+        return new SuccessResponseData(super.packForBT(page));
+    }
+
+    /***
+     * 施工app定位井盖找到后消除
+     * @param devCode
+     * @return
+     */
+    @RequestMapping(value = "/deleteByDevCode")
+    @ResponseBody
+    public Object deleteByDevCode(String devCode) {
+        return new SuccessResponseData(appDeviceAddService.deleteByDevCode(devCode));
+    }
+
+
 }
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 18f1929..b8d5b31 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
@@ -1,9 +1,13 @@
 package com.casic.missiles.modular.app.dao;
 
 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.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -16,4 +20,15 @@
 
     String findModeCodeByCode(@Param("devcode") String devcode);
 
+
+    List<DeviceAppDTO> getAppDeviceList(@Param("page") Page<DeviceAppDTO> page,
+                                        @Param("devCode") String devCode,
+                                        @Param("wellCode") String wellCode,
+                                        @Param("position") String position,
+                                        @Param("wellType") String wellType);
+
+
+    boolean deleteByDevCode(@Param("devCode") String devCode);
+
+
 }
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 5f28602..65be321 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
@@ -35,4 +35,46 @@
         LEFT JOIN product_device_type pdt ON  pd.`devtype_id`=pdt.`id`
         WHERE pd.`devcode`= #{devcode} LIMIT 1
     </select>
+
+
+    <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
+        SELECT
+            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>
+
+    <update id="deleteByDevCode">
+        UPDATE bus_device set VALID = 0
+        WHERE DEVCODE= #{devCode}
+    </update>
+
 </mapper>
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java
new file mode 100644
index 0000000..b75df09
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.app.dto;
+
+import lombok.Data;
+
+@Data
+public class DeviceAppDTO {
+
+    private  String devCode;
+    private  String deviceName;
+    private  String wellCode;
+    private  String coordinateX;
+    private  String coordinateY;
+    private  String latGaode;
+    private  String lngGaode;
+    private  String position;
+    private  String deptId;
+    private  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 4fdc66f..eaf5291 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
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.base.response.SuccessResponseData;
 import com.casic.missiles.core.common.annotion.BussinessLog;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.util.DateUtil;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
@@ -32,7 +33,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -287,4 +289,31 @@
         appDeviceAddService.batchDownloadFiles(recentDir, response);
     }
 
+    /***
+     * 施工app定位丢失井盖用
+     * @param devCode
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppDeviceList")
+    @ResponseBody
+    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+        Page<DeviceAppDTO> page = new PageFactory<DeviceAppDTO>().defaultPage();
+        page = appDeviceAddService.getAppDeviceList(page, devCode,wellCode,position,wellType);
+        return new SuccessResponseData(super.packForBT(page));
+    }
+
+    /***
+     * 施工app定位井盖找到后消除
+     * @param devCode
+     * @return
+     */
+    @RequestMapping(value = "/deleteByDevCode")
+    @ResponseBody
+    public Object deleteByDevCode(String devCode) {
+        return new SuccessResponseData(appDeviceAddService.deleteByDevCode(devCode));
+    }
+
+
 }
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 18f1929..b8d5b31 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
@@ -1,9 +1,13 @@
 package com.casic.missiles.modular.app.dao;
 
 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.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -16,4 +20,15 @@
 
     String findModeCodeByCode(@Param("devcode") String devcode);
 
+
+    List<DeviceAppDTO> getAppDeviceList(@Param("page") Page<DeviceAppDTO> page,
+                                        @Param("devCode") String devCode,
+                                        @Param("wellCode") String wellCode,
+                                        @Param("position") String position,
+                                        @Param("wellType") String wellType);
+
+
+    boolean deleteByDevCode(@Param("devCode") String devCode);
+
+
 }
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 5f28602..65be321 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
@@ -35,4 +35,46 @@
         LEFT JOIN product_device_type pdt ON  pd.`devtype_id`=pdt.`id`
         WHERE pd.`devcode`= #{devcode} LIMIT 1
     </select>
+
+
+    <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
+        SELECT
+            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>
+
+    <update id="deleteByDevCode">
+        UPDATE bus_device set VALID = 0
+        WHERE DEVCODE= #{devCode}
+    </update>
+
 </mapper>
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java
new file mode 100644
index 0000000..b75df09
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.app.dto;
+
+import lombok.Data;
+
+@Data
+public class DeviceAppDTO {
+
+    private  String devCode;
+    private  String deviceName;
+    private  String wellCode;
+    private  String coordinateX;
+    private  String coordinateY;
+    private  String latGaode;
+    private  String lngGaode;
+    private  String position;
+    private  String deptId;
+    private  String wellType;
+}
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 beb9f87..be3a793 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
@@ -2,6 +2,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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.BatchExportLog;
 import org.springframework.web.multipart.MultipartFile;
@@ -52,4 +53,8 @@
     Integer getStartTask(Long currentUserId);
 
     Page<BatchExportLog> batchLogs(Long currentUserId,String begTime, String endTime, Page<BatchExportLog> page);
+
+    Page<DeviceAppDTO> getAppDeviceList( Page<DeviceAppDTO> page, String devCode, String wellCode, String position,String wellType);
+
+    boolean deleteByDevCode(String devCode);
 }

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 4fdc66f..eaf5291 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
@@ -4,12 +4,13 @@
 import com.baomidou.mybatisplus.plugins.Page;
 import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.response.ResponseData;
+import com.casic.missiles.core.base.response.SuccessResponseData;
 import com.casic.missiles.core.common.annotion.BussinessLog;
 import com.casic.missiles.core.common.constant.factory.PageFactory;
-import com.casic.missiles.core.common.service.ICommonFileService;
 import com.casic.missiles.core.common.service.ICommonPermissionService;
 import com.casic.missiles.core.util.DateUtil;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.AppDeviceLog;
@@ -32,7 +33,8 @@
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
 /**
@@ -287,4 +289,31 @@
         appDeviceAddService.batchDownloadFiles(recentDir, response);
     }
 
+    /***
+     * 施工app定位丢失井盖用
+     * @param devCode
+     * @param wellCode
+     * @param position
+     * @return
+     */
+    @RequestMapping(value = "/getAppDeviceList")
+    @ResponseBody
+    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+        Page<DeviceAppDTO> page = new PageFactory<DeviceAppDTO>().defaultPage();
+        page = appDeviceAddService.getAppDeviceList(page, devCode,wellCode,position,wellType);
+        return new SuccessResponseData(super.packForBT(page));
+    }
+
+    /***
+     * 施工app定位井盖找到后消除
+     * @param devCode
+     * @return
+     */
+    @RequestMapping(value = "/deleteByDevCode")
+    @ResponseBody
+    public Object deleteByDevCode(String devCode) {
+        return new SuccessResponseData(appDeviceAddService.deleteByDevCode(devCode));
+    }
+
+
 }
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 18f1929..b8d5b31 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
@@ -1,9 +1,13 @@
 package com.casic.missiles.modular.app.dao;
 
 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.model.AppDeviceAdd;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * Mapper 接口
@@ -16,4 +20,15 @@
 
     String findModeCodeByCode(@Param("devcode") String devcode);
 
+
+    List<DeviceAppDTO> getAppDeviceList(@Param("page") Page<DeviceAppDTO> page,
+                                        @Param("devCode") String devCode,
+                                        @Param("wellCode") String wellCode,
+                                        @Param("position") String position,
+                                        @Param("wellType") String wellType);
+
+
+    boolean deleteByDevCode(@Param("devCode") String devCode);
+
+
 }
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 5f28602..65be321 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
@@ -35,4 +35,46 @@
         LEFT JOIN product_device_type pdt ON  pd.`devtype_id`=pdt.`id`
         WHERE pd.`devcode`= #{devcode} LIMIT 1
     </select>
+
+
+    <select id="getAppDeviceList" resultType="com.casic.missiles.modular.app.dto.DeviceAppDTO">
+        SELECT
+            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>
+
+    <update id="deleteByDevCode">
+        UPDATE bus_device set VALID = 0
+        WHERE DEVCODE= #{devCode}
+    </update>
+
 </mapper>
diff --git a/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java
new file mode 100644
index 0000000..b75df09
--- /dev/null
+++ b/casic-app/src/main/java/com/casic/missiles/modular/app/dto/DeviceAppDTO.java
@@ -0,0 +1,18 @@
+package com.casic.missiles.modular.app.dto;
+
+import lombok.Data;
+
+@Data
+public class DeviceAppDTO {
+
+    private  String devCode;
+    private  String deviceName;
+    private  String wellCode;
+    private  String coordinateX;
+    private  String coordinateY;
+    private  String latGaode;
+    private  String lngGaode;
+    private  String position;
+    private  String deptId;
+    private  String wellType;
+}
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 beb9f87..be3a793 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
@@ -2,6 +2,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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.BatchExportLog;
 import org.springframework.web.multipart.MultipartFile;
@@ -52,4 +53,8 @@
     Integer getStartTask(Long currentUserId);
 
     Page<BatchExportLog> batchLogs(Long currentUserId,String begTime, String endTime, Page<BatchExportLog> page);
+
+    Page<DeviceAppDTO> getAppDeviceList( Page<DeviceAppDTO> page, String devCode, String wellCode, String position,String wellType);
+
+    boolean deleteByDevCode(String devCode);
 }
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 a05ce31..22939b6 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
@@ -12,6 +12,7 @@
 import com.casic.missiles.modular.app.dao.AppDeviceAddMapper;
 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.model.AppDeviceAdd;
 import com.casic.missiles.modular.app.model.BatchExportLog;
 import com.casic.missiles.modular.app.service.IAppDeviceAddService;
@@ -447,4 +448,39 @@
         }
     }
 
+    private static Map<String, String> wellTypeHashMap = new HashMap<String, String>();
+    static {
+        wellTypeHashMap.put("1", "雨水井");
+        wellTypeHashMap.put("2", "污水井");
+        wellTypeHashMap.put("3", "燃气井");
+        wellTypeHashMap.put("4", "热力井");
+        wellTypeHashMap.put("5", "电力井");
+        wellTypeHashMap.put("6", "通信井");
+        wellTypeHashMap.put("7", "给水井");
+        wellTypeHashMap.put("8", "公安井");
+        wellTypeHashMap.put("9", "环卫井");
+        wellTypeHashMap.put("10", "交通井");
+        wellTypeHashMap.put("11", "路灯井");
+        wellTypeHashMap.put("12", "市政井");
+        wellTypeHashMap.put("13", "有线电视井");
+        wellTypeHashMap.put("14", "园林绿化井");
+        wellTypeHashMap.put("15", "其他");
+        wellTypeHashMap.put("16", "消防井");
+        wellTypeHashMap.put("17", "监控井");
+    }
+
+    @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){
+            deviceAppDTO.setWellType(wellTypeHashMap.get(deviceAppDTO.getWellType()));
+        }
+        page.setRecords(deviceAppDTOList);
+        return page;
+    }
+
+    @Override
+    public boolean deleteByDevCode(String devCode) {
+        return this.baseMapper.deleteByDevCode(devCode);
+    }
 }