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 c00306e..a7bbd50 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
@@ -89,9 +89,14 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-//            appDeviceAdd.setDescription("安装设备");
-//        }
+        //检验井编号是否已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            List<WellAppDTO> wellAppDTOList = appDeviceAddService.getAppWellList(appDeviceAdd.getWellcode(), "", "","");
+            if (wellAppDTOList != null && wellAppDTOList.size() > 0) {
+                if ("1".equals(wellAppDTOList.get(0).getIsInStall()))
+                    return ResponseData.error(appDeviceAdd.getWellcode() + "->井编号已安装");
+            }
+        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
@@ -114,6 +119,10 @@
         if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
             appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
         }
+        //更新井编号已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"1");
+        }
         return ResponseData.success();
     }
 
@@ -131,6 +140,10 @@
             appDeviceLogService.delete(ew);
         }
         appDeviceAddService.deleteById(Long.valueOf(appDeviceAddId));
+        //更新井编号未安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd) && ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"0");
+        }
         return ResponseData.success();
     }
 
@@ -219,30 +232,6 @@
         return appDeviceAddService.findModeCodeByCode(devcode);
     }
 
-//    /**
-//     * 设备基础信息导出
-//     */
-//    @RequestMapping(value = "/listExp")
-//    public void reportExport(String devcode, String devtype,
-//                             String begTime, String endTime,
-//                             String project, String installPerson) throws IOException {
-//
-//        List<AppDeviceAdd> list = appDeviceAddService.reportExport(devcode, devtype,
-//                begTime, endTime, project, installPerson);
-//        list.forEach(appDeviceAdd -> {
-//            appDeviceAdd.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceAdd.getWelltype()));
-//        });
-//
-//        List<Object> res = new ArrayList<>();
-//        res.addAll(list);
-//        //获取导出文件header
-//        super.exportExcel(DeviceBaseExportEnum.DeviceBase_EXPORT, res);
-//    }
-//
-//    @RequestMapping(value = "/convert84")
-//    public void convert84() {
-//        appDeviceAddService.convert84();
-//    }
 
     //定时删除
     //照片一起导出
@@ -283,7 +272,7 @@
     public Object batchLogs(String begTime, String endTime) {
         Page<BatchExportLog> page = new PageFactory<BatchExportLog>().defaultPage();
         Long currentUserId = permissionService.getCurrLoginUser().getId();
-        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page)));
+        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId, begTime, endTime, page)));
     }
 
     @CrossOrigin
@@ -301,9 +290,9 @@
      */
     @RequestMapping(value = "/getAppDeviceList")
     @ResponseBody
-    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+    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);
+        page = appDeviceAddService.getAppDeviceList(page, devCode, wellCode, position, wellType);
         return new SuccessResponseData(super.packForBT(page));
     }
 
@@ -328,9 +317,9 @@
      */
     @RequestMapping(value = "/getAppWellList")
     @ResponseBody
-    public Object getAppWellList(String wellCode, String position,String wellType) {
+    public Object getAppWellList(String wellCode, String position, String wellType,String isInStall) {
 
-        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode, position, wellType,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 c00306e..a7bbd50 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
@@ -89,9 +89,14 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-//            appDeviceAdd.setDescription("安装设备");
-//        }
+        //检验井编号是否已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            List<WellAppDTO> wellAppDTOList = appDeviceAddService.getAppWellList(appDeviceAdd.getWellcode(), "", "","");
+            if (wellAppDTOList != null && wellAppDTOList.size() > 0) {
+                if ("1".equals(wellAppDTOList.get(0).getIsInStall()))
+                    return ResponseData.error(appDeviceAdd.getWellcode() + "->井编号已安装");
+            }
+        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
@@ -114,6 +119,10 @@
         if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
             appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
         }
+        //更新井编号已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"1");
+        }
         return ResponseData.success();
     }
 
@@ -131,6 +140,10 @@
             appDeviceLogService.delete(ew);
         }
         appDeviceAddService.deleteById(Long.valueOf(appDeviceAddId));
+        //更新井编号未安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd) && ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"0");
+        }
         return ResponseData.success();
     }
 
@@ -219,30 +232,6 @@
         return appDeviceAddService.findModeCodeByCode(devcode);
     }
 
-//    /**
-//     * 设备基础信息导出
-//     */
-//    @RequestMapping(value = "/listExp")
-//    public void reportExport(String devcode, String devtype,
-//                             String begTime, String endTime,
-//                             String project, String installPerson) throws IOException {
-//
-//        List<AppDeviceAdd> list = appDeviceAddService.reportExport(devcode, devtype,
-//                begTime, endTime, project, installPerson);
-//        list.forEach(appDeviceAdd -> {
-//            appDeviceAdd.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceAdd.getWelltype()));
-//        });
-//
-//        List<Object> res = new ArrayList<>();
-//        res.addAll(list);
-//        //获取导出文件header
-//        super.exportExcel(DeviceBaseExportEnum.DeviceBase_EXPORT, res);
-//    }
-//
-//    @RequestMapping(value = "/convert84")
-//    public void convert84() {
-//        appDeviceAddService.convert84();
-//    }
 
     //定时删除
     //照片一起导出
@@ -283,7 +272,7 @@
     public Object batchLogs(String begTime, String endTime) {
         Page<BatchExportLog> page = new PageFactory<BatchExportLog>().defaultPage();
         Long currentUserId = permissionService.getCurrLoginUser().getId();
-        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page)));
+        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId, begTime, endTime, page)));
     }
 
     @CrossOrigin
@@ -301,9 +290,9 @@
      */
     @RequestMapping(value = "/getAppDeviceList")
     @ResponseBody
-    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+    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);
+        page = appDeviceAddService.getAppDeviceList(page, devCode, wellCode, position, wellType);
         return new SuccessResponseData(super.packForBT(page));
     }
 
@@ -328,9 +317,9 @@
      */
     @RequestMapping(value = "/getAppWellList")
     @ResponseBody
-    public Object getAppWellList(String wellCode, String position,String wellType) {
+    public Object getAppWellList(String wellCode, String position, String wellType,String isInStall) {
 
-        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode, position, wellType,isInStall));
     }
 
 
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 ba6dc28..2dd6a3c 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
@@ -31,10 +31,15 @@
 
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
+    boolean updateWellState(@Param("wellCode") String wellCode,@Param("flag") String flag);
+
+
+
 
     List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
                                     @Param("position") String position,
-                                    @Param("wellType") String wellType);
+                                    @Param("wellType") String wellType,
+                                    @Param("isInStall") 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 c00306e..a7bbd50 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
@@ -89,9 +89,14 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-//            appDeviceAdd.setDescription("安装设备");
-//        }
+        //检验井编号是否已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            List<WellAppDTO> wellAppDTOList = appDeviceAddService.getAppWellList(appDeviceAdd.getWellcode(), "", "","");
+            if (wellAppDTOList != null && wellAppDTOList.size() > 0) {
+                if ("1".equals(wellAppDTOList.get(0).getIsInStall()))
+                    return ResponseData.error(appDeviceAdd.getWellcode() + "->井编号已安装");
+            }
+        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
@@ -114,6 +119,10 @@
         if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
             appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
         }
+        //更新井编号已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"1");
+        }
         return ResponseData.success();
     }
 
@@ -131,6 +140,10 @@
             appDeviceLogService.delete(ew);
         }
         appDeviceAddService.deleteById(Long.valueOf(appDeviceAddId));
+        //更新井编号未安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd) && ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"0");
+        }
         return ResponseData.success();
     }
 
@@ -219,30 +232,6 @@
         return appDeviceAddService.findModeCodeByCode(devcode);
     }
 
-//    /**
-//     * 设备基础信息导出
-//     */
-//    @RequestMapping(value = "/listExp")
-//    public void reportExport(String devcode, String devtype,
-//                             String begTime, String endTime,
-//                             String project, String installPerson) throws IOException {
-//
-//        List<AppDeviceAdd> list = appDeviceAddService.reportExport(devcode, devtype,
-//                begTime, endTime, project, installPerson);
-//        list.forEach(appDeviceAdd -> {
-//            appDeviceAdd.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceAdd.getWelltype()));
-//        });
-//
-//        List<Object> res = new ArrayList<>();
-//        res.addAll(list);
-//        //获取导出文件header
-//        super.exportExcel(DeviceBaseExportEnum.DeviceBase_EXPORT, res);
-//    }
-//
-//    @RequestMapping(value = "/convert84")
-//    public void convert84() {
-//        appDeviceAddService.convert84();
-//    }
 
     //定时删除
     //照片一起导出
@@ -283,7 +272,7 @@
     public Object batchLogs(String begTime, String endTime) {
         Page<BatchExportLog> page = new PageFactory<BatchExportLog>().defaultPage();
         Long currentUserId = permissionService.getCurrLoginUser().getId();
-        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page)));
+        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId, begTime, endTime, page)));
     }
 
     @CrossOrigin
@@ -301,9 +290,9 @@
      */
     @RequestMapping(value = "/getAppDeviceList")
     @ResponseBody
-    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+    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);
+        page = appDeviceAddService.getAppDeviceList(page, devCode, wellCode, position, wellType);
         return new SuccessResponseData(super.packForBT(page));
     }
 
@@ -328,9 +317,9 @@
      */
     @RequestMapping(value = "/getAppWellList")
     @ResponseBody
-    public Object getAppWellList(String wellCode, String position,String wellType) {
+    public Object getAppWellList(String wellCode, String position, String wellType,String isInStall) {
 
-        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode, position, wellType,isInStall));
     }
 
 
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 ba6dc28..2dd6a3c 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
@@ -31,10 +31,15 @@
 
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
+    boolean updateWellState(@Param("wellCode") String wellCode,@Param("flag") String flag);
+
+
+
 
     List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
                                     @Param("position") String position,
-                                    @Param("wellType") String wellType);
+                                    @Param("wellType") String wellType,
+                                    @Param("isInStall") String isInStall);
 
 
 }
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 08db860..51b5049 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
@@ -96,6 +96,9 @@
         <if test="position != null and position != '' ">
             and  w.POSITION like CONCAT('%',#{position}, '%')
         </if>
+        <if test="isInStall != null and isInStall != '' ">
+            and  w.BFZT = #{isInStall}
+        </if>
         <if test="wellType != null and wellType != '' ">
             and w.WELL_TYPE in
             <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
@@ -109,4 +112,10 @@
         WHERE DEVCODE= #{devCode}
     </update>
 
+
+    <update id="updateWellState">
+        UPDATE bus_well_info set BFZT = #{flag},TS=NOW()
+        WHERE WELL_CODE= #{wellCode}
+    </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 c00306e..a7bbd50 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
@@ -89,9 +89,14 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-//            appDeviceAdd.setDescription("安装设备");
-//        }
+        //检验井编号是否已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            List<WellAppDTO> wellAppDTOList = appDeviceAddService.getAppWellList(appDeviceAdd.getWellcode(), "", "","");
+            if (wellAppDTOList != null && wellAppDTOList.size() > 0) {
+                if ("1".equals(wellAppDTOList.get(0).getIsInStall()))
+                    return ResponseData.error(appDeviceAdd.getWellcode() + "->井编号已安装");
+            }
+        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
@@ -114,6 +119,10 @@
         if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
             appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
         }
+        //更新井编号已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"1");
+        }
         return ResponseData.success();
     }
 
@@ -131,6 +140,10 @@
             appDeviceLogService.delete(ew);
         }
         appDeviceAddService.deleteById(Long.valueOf(appDeviceAddId));
+        //更新井编号未安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd) && ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"0");
+        }
         return ResponseData.success();
     }
 
@@ -219,30 +232,6 @@
         return appDeviceAddService.findModeCodeByCode(devcode);
     }
 
-//    /**
-//     * 设备基础信息导出
-//     */
-//    @RequestMapping(value = "/listExp")
-//    public void reportExport(String devcode, String devtype,
-//                             String begTime, String endTime,
-//                             String project, String installPerson) throws IOException {
-//
-//        List<AppDeviceAdd> list = appDeviceAddService.reportExport(devcode, devtype,
-//                begTime, endTime, project, installPerson);
-//        list.forEach(appDeviceAdd -> {
-//            appDeviceAdd.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceAdd.getWelltype()));
-//        });
-//
-//        List<Object> res = new ArrayList<>();
-//        res.addAll(list);
-//        //获取导出文件header
-//        super.exportExcel(DeviceBaseExportEnum.DeviceBase_EXPORT, res);
-//    }
-//
-//    @RequestMapping(value = "/convert84")
-//    public void convert84() {
-//        appDeviceAddService.convert84();
-//    }
 
     //定时删除
     //照片一起导出
@@ -283,7 +272,7 @@
     public Object batchLogs(String begTime, String endTime) {
         Page<BatchExportLog> page = new PageFactory<BatchExportLog>().defaultPage();
         Long currentUserId = permissionService.getCurrLoginUser().getId();
-        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page)));
+        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId, begTime, endTime, page)));
     }
 
     @CrossOrigin
@@ -301,9 +290,9 @@
      */
     @RequestMapping(value = "/getAppDeviceList")
     @ResponseBody
-    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+    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);
+        page = appDeviceAddService.getAppDeviceList(page, devCode, wellCode, position, wellType);
         return new SuccessResponseData(super.packForBT(page));
     }
 
@@ -328,9 +317,9 @@
      */
     @RequestMapping(value = "/getAppWellList")
     @ResponseBody
-    public Object getAppWellList(String wellCode, String position,String wellType) {
+    public Object getAppWellList(String wellCode, String position, String wellType,String isInStall) {
 
-        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode, position, wellType,isInStall));
     }
 
 
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 ba6dc28..2dd6a3c 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
@@ -31,10 +31,15 @@
 
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
+    boolean updateWellState(@Param("wellCode") String wellCode,@Param("flag") String flag);
+
+
+
 
     List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
                                     @Param("position") String position,
-                                    @Param("wellType") String wellType);
+                                    @Param("wellType") String wellType,
+                                    @Param("isInStall") String isInStall);
 
 
 }
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 08db860..51b5049 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
@@ -96,6 +96,9 @@
         <if test="position != null and position != '' ">
             and  w.POSITION like CONCAT('%',#{position}, '%')
         </if>
+        <if test="isInStall != null and isInStall != '' ">
+            and  w.BFZT = #{isInStall}
+        </if>
         <if test="wellType != null and wellType != '' ">
             and w.WELL_TYPE in
             <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
@@ -109,4 +112,10 @@
         WHERE DEVCODE= #{devCode}
     </update>
 
+
+    <update id="updateWellState">
+        UPDATE bus_well_info set BFZT = #{flag},TS=NOW()
+        WHERE WELL_CODE= #{wellCode}
+    </update>
+
 </mapper>
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 4ac9a45..f53f8de 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
@@ -59,5 +59,7 @@
 
     boolean deleteByDevCode(String devCode);
 
-    List<WellAppDTO> getAppWellList( String wellCode, String position,String wellType);
+    boolean updateWellState(String wellCode,String flag);
+
+    List<WellAppDTO> getAppWellList( String wellCode, String position,String wellType,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 c00306e..a7bbd50 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
@@ -89,9 +89,14 @@
     @ResponseBody
     public Object add(AppDeviceAdd appDeviceAdd) {
 
-//        if (ToolUtil.isEmpty(appDeviceAdd.getDescription())) {
-//            appDeviceAdd.setDescription("安装设备");
-//        }
+        //检验井编号是否已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            List<WellAppDTO> wellAppDTOList = appDeviceAddService.getAppWellList(appDeviceAdd.getWellcode(), "", "","");
+            if (wellAppDTOList != null && wellAppDTOList.size() > 0) {
+                if ("1".equals(wellAppDTOList.get(0).getIsInStall()))
+                    return ResponseData.error(appDeviceAdd.getWellcode() + "->井编号已安装");
+            }
+        }
         //转换火星坐标系至ws84坐标
         if (ToolUtil.isNotEmpty(appDeviceAdd.getLongitude())
                 && ToolUtil.isNotEmpty(appDeviceAdd.getLatitude())) {
@@ -114,6 +119,10 @@
         if (appDeviceLogService.getListByCode(appDeviceAdd.getDevcode()).size() == 0) {
             appDeviceLogService.insert(new AppDeviceLog(appDeviceAdd));
         }
+        //更新井编号已安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"1");
+        }
         return ResponseData.success();
     }
 
@@ -131,6 +140,10 @@
             appDeviceLogService.delete(ew);
         }
         appDeviceAddService.deleteById(Long.valueOf(appDeviceAddId));
+        //更新井编号未安装
+        if (ToolUtil.isNotEmpty(appDeviceAdd) && ToolUtil.isNotEmpty(appDeviceAdd.getWellcode())) {
+            appDeviceAddService.updateWellState(appDeviceAdd.getWellcode(),"0");
+        }
         return ResponseData.success();
     }
 
@@ -219,30 +232,6 @@
         return appDeviceAddService.findModeCodeByCode(devcode);
     }
 
-//    /**
-//     * 设备基础信息导出
-//     */
-//    @RequestMapping(value = "/listExp")
-//    public void reportExport(String devcode, String devtype,
-//                             String begTime, String endTime,
-//                             String project, String installPerson) throws IOException {
-//
-//        List<AppDeviceAdd> list = appDeviceAddService.reportExport(devcode, devtype,
-//                begTime, endTime, project, installPerson);
-//        list.forEach(appDeviceAdd -> {
-//            appDeviceAdd.setWelltype(permissionService.getDictNameByCode("sluicewellType", appDeviceAdd.getWelltype()));
-//        });
-//
-//        List<Object> res = new ArrayList<>();
-//        res.addAll(list);
-//        //获取导出文件header
-//        super.exportExcel(DeviceBaseExportEnum.DeviceBase_EXPORT, res);
-//    }
-//
-//    @RequestMapping(value = "/convert84")
-//    public void convert84() {
-//        appDeviceAddService.convert84();
-//    }
 
     //定时删除
     //照片一起导出
@@ -283,7 +272,7 @@
     public Object batchLogs(String begTime, String endTime) {
         Page<BatchExportLog> page = new PageFactory<BatchExportLog>().defaultPage();
         Long currentUserId = permissionService.getCurrLoginUser().getId();
-        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId,begTime, endTime, page)));
+        return ResponseData.success(super.packForBT(appDeviceAddService.batchLogs(currentUserId, begTime, endTime, page)));
     }
 
     @CrossOrigin
@@ -301,9 +290,9 @@
      */
     @RequestMapping(value = "/getAppDeviceList")
     @ResponseBody
-    public Object listPage(String devCode, String wellCode, String position,String wellType) {
+    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);
+        page = appDeviceAddService.getAppDeviceList(page, devCode, wellCode, position, wellType);
         return new SuccessResponseData(super.packForBT(page));
     }
 
@@ -328,9 +317,9 @@
      */
     @RequestMapping(value = "/getAppWellList")
     @ResponseBody
-    public Object getAppWellList(String wellCode, String position,String wellType) {
+    public Object getAppWellList(String wellCode, String position, String wellType,String isInStall) {
 
-        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode,position,wellType));
+        return new SuccessResponseData(appDeviceAddService.getAppWellList(wellCode, position, wellType,isInStall));
     }
 
 
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 ba6dc28..2dd6a3c 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
@@ -31,10 +31,15 @@
 
     boolean deleteByDevCode(@Param("devCode") String devCode);
 
+    boolean updateWellState(@Param("wellCode") String wellCode,@Param("flag") String flag);
+
+
+
 
     List<WellAppDTO> getAppWellList(@Param("wellCode") String wellCode,
                                     @Param("position") String position,
-                                    @Param("wellType") String wellType);
+                                    @Param("wellType") String wellType,
+                                    @Param("isInStall") String isInStall);
 
 
 }
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 08db860..51b5049 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
@@ -96,6 +96,9 @@
         <if test="position != null and position != '' ">
             and  w.POSITION like CONCAT('%',#{position}, '%')
         </if>
+        <if test="isInStall != null and isInStall != '' ">
+            and  w.BFZT = #{isInStall}
+        </if>
         <if test="wellType != null and wellType != '' ">
             and w.WELL_TYPE in
             <foreach item="item" index="index" collection="wellType.split(',')"  open="(" separator="," close=")">
@@ -109,4 +112,10 @@
         WHERE DEVCODE= #{devCode}
     </update>
 
+
+    <update id="updateWellState">
+        UPDATE bus_well_info set BFZT = #{flag},TS=NOW()
+        WHERE WELL_CODE= #{wellCode}
+    </update>
+
 </mapper>
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 4ac9a45..f53f8de 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
@@ -59,5 +59,7 @@
 
     boolean deleteByDevCode(String devCode);
 
-    List<WellAppDTO> getAppWellList( String wellCode, String position,String wellType);
+    boolean updateWellState(String wellCode,String flag);
+
+    List<WellAppDTO> getAppWellList( String wellCode, String position,String wellType,String isInStall);
 }
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 afba2d8..9d14cc9 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
@@ -487,8 +487,14 @@
     }
 
     @Override
-    public List<WellAppDTO> getAppWellList(String wellCode, String position, String wellType) {
-        List<WellAppDTO> wellAppDTOList = this.baseMapper.getAppWellList(wellCode, position, wellType);
+    public boolean updateWellState(String wellCode,String flag) {
+
+        return this.baseMapper.updateWellState(wellCode,flag);
+    }
+
+    @Override
+    public List<WellAppDTO> getAppWellList(String wellCode, String position, String wellType,String isInStall) {
+        List<WellAppDTO> wellAppDTOList = this.baseMapper.getAppWellList(wellCode, position, wellType,isInStall);
         for (WellAppDTO wellAppDTO : wellAppDTOList) {
             wellAppDTO.setWellType(wellTypeHashMap.get(wellAppDTO.getWellType()));
         }