diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 3059dd7..3a08419 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
-
+    List<DeviceWellDto> selectWellIdsByCode(@Param("wellCode") String wellCode);
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
     List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
@@ -83,4 +83,6 @@
     List<Map<String,String>> selectDept3List();
 
     List<Map<String,String>> selectArea3List();
+
+
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 3059dd7..3a08419 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
-
+    List<DeviceWellDto> selectWellIdsByCode(@Param("wellCode") String wellCode);
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
     List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
@@ -83,4 +83,6 @@
     List<Map<String,String>> selectDept3List();
 
     List<Map<String,String>> selectArea3List();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 73a88cc..47745f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,7 +39,13 @@
           AND WELL_CODE = #{wellCode}
           AND DEPTID = #{deptId}
     </select>
-
+    <select id="selectWellIdsByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
+    </select>
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
@@ -986,4 +992,5 @@
         FROM bus_sync_org_relation t
         WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
     </select>
+
 </mapper>

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 3059dd7..3a08419 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
-
+    List<DeviceWellDto> selectWellIdsByCode(@Param("wellCode") String wellCode);
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
     List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
@@ -83,4 +83,6 @@
     List<Map<String,String>> selectDept3List();
 
     List<Map<String,String>> selectArea3List();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 73a88cc..47745f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,7 +39,13 @@
           AND WELL_CODE = #{wellCode}
           AND DEPTID = #{deptId}
     </select>
-
+    <select id="selectWellIdsByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
+    </select>
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
@@ -986,4 +992,5 @@
         FROM bus_sync_org_relation t
         WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index a589497..e71a1ae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,7 +40,7 @@
      * @return
      */
     DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
-
+    List<DeviceWellDto> selectWellIdByCode(String wellCode);
 
     Device getDeviceByDevCode(String devCode);
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 3059dd7..3a08419 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
-
+    List<DeviceWellDto> selectWellIdsByCode(@Param("wellCode") String wellCode);
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
     List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
@@ -83,4 +83,6 @@
     List<Map<String,String>> selectDept3List();
 
     List<Map<String,String>> selectArea3List();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 73a88cc..47745f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,7 +39,13 @@
           AND WELL_CODE = #{wellCode}
           AND DEPTID = #{deptId}
     </select>
-
+    <select id="selectWellIdsByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
+    </select>
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
@@ -986,4 +992,5 @@
         FROM bus_sync_org_relation t
         WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index a589497..e71a1ae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,7 +40,7 @@
      * @return
      */
     DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
-
+    List<DeviceWellDto> selectWellIdByCode(String wellCode);
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
index 3f3908d..e881acd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.model.DeviceWell;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备闸井关联表 服务类
@@ -14,7 +16,7 @@
 public interface IDeviceWellService extends IService<DeviceWell> {
 
     void updateByDeviceId(Long deviceId, Long wellId);
-    DeviceWell getDeviceWellByDevId(Long devId);
+    List<DeviceWell> getDeviceWellByDevId(Long devId);
 
     void deleteByDeviceId(Long id);
 }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 3059dd7..3a08419 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
-
+    List<DeviceWellDto> selectWellIdsByCode(@Param("wellCode") String wellCode);
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
     List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
@@ -83,4 +83,6 @@
     List<Map<String,String>> selectDept3List();
 
     List<Map<String,String>> selectArea3List();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 73a88cc..47745f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,7 +39,13 @@
           AND WELL_CODE = #{wellCode}
           AND DEPTID = #{deptId}
     </select>
-
+    <select id="selectWellIdsByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
+    </select>
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
@@ -986,4 +992,5 @@
         FROM bus_sync_org_relation t
         WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index a589497..e71a1ae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,7 +40,7 @@
      * @return
      */
     DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
-
+    List<DeviceWellDto> selectWellIdByCode(String wellCode);
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
index 3f3908d..e881acd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.model.DeviceWell;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备闸井关联表 服务类
@@ -14,7 +16,7 @@
 public interface IDeviceWellService extends IService<DeviceWell> {
 
     void updateByDeviceId(Long deviceId, Long wellId);
-    DeviceWell getDeviceWellByDevId(Long devId);
+    List<DeviceWell> getDeviceWellByDevId(Long devId);
 
     void deleteByDeviceId(Long id);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 1dcf311..8558601 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -109,8 +109,8 @@
     @Override
     public boolean insert(Device entity) {
         //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
-        if (ToolUtil.isEmpty(wellDto)) {
+        List<DeviceWellDto> wellDtos = this.selectWellIdByCode(entity.getWellCode());
+        if (ToolUtil.isEmpty(wellDtos)) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("闸井编号不存在");
             throw gunsException;
@@ -147,7 +147,10 @@
             deviceConcentratorService.insert(createConcentrator(entity.getId(), concentratorDto.getId()));
         }
         //关联设备井盖信息
-        deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+        for (DeviceWellDto wellDto : wellDtos) {
+            deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+        }
+
         return flag;
     }
 
@@ -155,20 +158,37 @@
     @Override
     public boolean updateById(Device entity) {
         DeviceConcentrator deviceConcentrator = deviceConcentratorService.getDeviceConcentratorBydevId(entity.getId());
-        DeviceWell deviceWell = deviceWellService.getDeviceWellByDevId(entity.getId());
-
+        List<DeviceWell> deviceWells = deviceWellService.getDeviceWellByDevId(entity.getId());
+        Map<Long,DeviceWell> maps = new HashMap<>();
+        for (DeviceWell deviceWell : deviceWells) {
+            maps.put(deviceWell.getWellId(),deviceWell);
+        }
         //根据井编号查询井信息
         if (ToolUtil.isNotEmpty(entity.getWellCode())) {
-            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
-            if (ToolUtil.isEmpty(wellDto)) {
+            List<DeviceWellDto> wellDtos = this.selectWellIdByCode(entity.getWellCode());
+            if (ToolUtil.isEmpty(wellDtos)) {
                 GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
                 gunsException.setMessage("闸井编号不存在");
                 throw gunsException;
             }
-            if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
-                deviceWellService.deleteByDeviceId(entity.getId());
-                deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+            Map<Long,DeviceWellDto> dtoMap = new HashMap<>();
+            for (DeviceWellDto wellDto : wellDtos) {
+                dtoMap.put(wellDto.getWellId(),wellDto);
             }
+
+            //添加新增闸井关系
+            for (DeviceWellDto wellDto : wellDtos) {
+                if(!maps.containsKey(wellDto.getWellId())){
+                 deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+                }
+            }
+            //移除不再关联的关系
+            for (DeviceWell deviceWell : deviceWells) {
+                if(!dtoMap.containsKey(deviceWell.getWellId())){
+                    deviceWellService.deleteById(entity.getId());
+                }
+            }
+
         }
 
         DeviceType deviceType = deviceTypeService.selectById(entity.getDeviceType());
@@ -246,6 +266,11 @@
     }
 
     @Override
+    public List<DeviceWellDto> selectWellIdByCode(String wellCode) {
+        return this.baseMapper.selectWellIdsByCode(wellCode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 3059dd7..3a08419 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -24,7 +24,7 @@
     List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("deptIds") List<Long> deptIds,@Param("isOnline") String isOnline, @Param("maxCell") float maxCell);
 
     DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode,@Param("deptId") String deptId);
-
+    List<DeviceWellDto> selectWellIdsByCode(@Param("wellCode") String wellCode);
     DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode);
 
     List<DeviceMonitorDataDto> selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page<DeviceMonitorDataDto> page, @Param("deptIds") List<Long> deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords);
@@ -83,4 +83,6 @@
     List<Map<String,String>> selectDept3List();
 
     List<Map<String,String>> selectArea3List();
+
+
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 73a88cc..47745f0 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -39,7 +39,13 @@
           AND WELL_CODE = #{wellCode}
           AND DEPTID = #{deptId}
     </select>
-
+    <select id="selectWellIdsByCode" resultType="com.casic.missiles.modular.system.dto.DeviceWellDto">
+        SELECT id as wellId, WELL_CODE as WELLCODE, DEPTID
+        FROM bus_well_info
+        WHERE VALID = '1'
+          AND WELL_CODE = #{wellCode}
+          AND DEPTID = #{deptId}
+    </select>
     <select id="selectDeviceConcentorByCode" resultType="com.casic.missiles.modular.system.dto.DeviceConcentratorDto">
         SELECT id, CONCENCODE
         FROM bus_concentrator
@@ -986,4 +992,5 @@
         FROM bus_sync_org_relation t
         WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
     </select>
+
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index a589497..e71a1ae 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -40,7 +40,7 @@
      * @return
      */
     DeviceWellDto selectWellIdByCode(String wellCode,String deptId);
-
+    List<DeviceWellDto> selectWellIdByCode(String wellCode);
 
     Device getDeviceByDevCode(String devCode);
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
index 3f3908d..e881acd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceWellService.java
@@ -3,6 +3,8 @@
 import com.casic.missiles.modular.system.model.DeviceWell;
 import com.baomidou.mybatisplus.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备闸井关联表 服务类
@@ -14,7 +16,7 @@
 public interface IDeviceWellService extends IService<DeviceWell> {
 
     void updateByDeviceId(Long deviceId, Long wellId);
-    DeviceWell getDeviceWellByDevId(Long devId);
+    List<DeviceWell> getDeviceWellByDevId(Long devId);
 
     void deleteByDeviceId(Long id);
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 1dcf311..8558601 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -109,8 +109,8 @@
     @Override
     public boolean insert(Device entity) {
         //根据井编号查询井信息
-        DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
-        if (ToolUtil.isEmpty(wellDto)) {
+        List<DeviceWellDto> wellDtos = this.selectWellIdByCode(entity.getWellCode());
+        if (ToolUtil.isEmpty(wellDtos)) {
             GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
             gunsException.setMessage("闸井编号不存在");
             throw gunsException;
@@ -147,7 +147,10 @@
             deviceConcentratorService.insert(createConcentrator(entity.getId(), concentratorDto.getId()));
         }
         //关联设备井盖信息
-        deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+        for (DeviceWellDto wellDto : wellDtos) {
+            deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+        }
+
         return flag;
     }
 
@@ -155,20 +158,37 @@
     @Override
     public boolean updateById(Device entity) {
         DeviceConcentrator deviceConcentrator = deviceConcentratorService.getDeviceConcentratorBydevId(entity.getId());
-        DeviceWell deviceWell = deviceWellService.getDeviceWellByDevId(entity.getId());
-
+        List<DeviceWell> deviceWells = deviceWellService.getDeviceWellByDevId(entity.getId());
+        Map<Long,DeviceWell> maps = new HashMap<>();
+        for (DeviceWell deviceWell : deviceWells) {
+            maps.put(deviceWell.getWellId(),deviceWell);
+        }
         //根据井编号查询井信息
         if (ToolUtil.isNotEmpty(entity.getWellCode())) {
-            DeviceWellDto wellDto = this.selectWellIdByCode(entity.getWellCode(), entity.getDeptId());
-            if (ToolUtil.isEmpty(wellDto)) {
+            List<DeviceWellDto> wellDtos = this.selectWellIdByCode(entity.getWellCode());
+            if (ToolUtil.isEmpty(wellDtos)) {
                 GunsException gunsException = new GunsException(GunsExceptionEnum.REQUEST_NULL);
                 gunsException.setMessage("闸井编号不存在");
                 throw gunsException;
             }
-            if (!deviceWell.getWellId().equals(wellDto.getWellId())) {
-                deviceWellService.deleteByDeviceId(entity.getId());
-                deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+            Map<Long,DeviceWellDto> dtoMap = new HashMap<>();
+            for (DeviceWellDto wellDto : wellDtos) {
+                dtoMap.put(wellDto.getWellId(),wellDto);
             }
+
+            //添加新增闸井关系
+            for (DeviceWellDto wellDto : wellDtos) {
+                if(!maps.containsKey(wellDto.getWellId())){
+                 deviceWellService.insert(createDeviceWell(entity.getId(), wellDto.getWellId()));
+                }
+            }
+            //移除不再关联的关系
+            for (DeviceWell deviceWell : deviceWells) {
+                if(!dtoMap.containsKey(deviceWell.getWellId())){
+                    deviceWellService.deleteById(entity.getId());
+                }
+            }
+
         }
 
         DeviceType deviceType = deviceTypeService.selectById(entity.getDeviceType());
@@ -246,6 +266,11 @@
     }
 
     @Override
+    public List<DeviceWellDto> selectWellIdByCode(String wellCode) {
+        return this.baseMapper.selectWellIdsByCode(wellCode);
+    }
+
+    @Override
     public DeviceConcentratorDto selectDeviceConcentorByCode(String concenCode) {
         return this.baseMapper.selectDeviceConcentorByCode(concenCode);
     }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java
index 84caf80..2f8499b 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceWellServiceImpl.java
@@ -7,6 +7,8 @@
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备闸井关联表 服务实现类
@@ -19,11 +21,11 @@
 public class DeviceWellServiceImpl extends ServiceImpl<DeviceWellMapper, DeviceWell> implements IDeviceWellService {
 
     @Override
-    public DeviceWell getDeviceWellByDevId(Long devId) {
-        DeviceWell deviceWell = new DeviceWell();
-        deviceWell.setDeviceId(devId);
-        deviceWell.setValid("1");
-        return this.baseMapper.selectOne(deviceWell);
+    public List<DeviceWell> getDeviceWellByDevId(Long devId) {
+        EntityWrapper<DeviceWell> entityWrapper = new EntityWrapper<>();
+        entityWrapper.eq("DEVICE_ID",devId);
+        entityWrapper.eq("VALID","1");
+        return this.baseMapper.selectList(entityWrapper);
     }
 
     @Override