diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 2a6cd31..1bcf678 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -82,6 +82,13 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/listAllLabel")
+    @ResponseBody
+    public Object listAllLabel() {
+        List<Map<String,Object>> list = deviceService.selectListAll();
+        return ResponseData.success(list);
+    }
+
     /**
      * 添加设备
      */

diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 2a6cd31..1bcf678 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -82,6 +82,13 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/listAllLabel")
+    @ResponseBody
+    public Object listAllLabel() {
+        List<Map<String,Object>> list = deviceService.selectListAll();
+        return ResponseData.success(list);
+    }
+
     /**
      * 添加设备
      */
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index f33d4b0..beb9786 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -22,4 +22,6 @@
     Boolean clearDoorCode(@Param("doorCode")String doorCode);
 
     List<Device> selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType);
+
+    List<Map<String,Object>> selectListAll();
 }

diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 2a6cd31..1bcf678 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -82,6 +82,13 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/listAllLabel")
+    @ResponseBody
+    public Object listAllLabel() {
+        List<Map<String,Object>> list = deviceService.selectListAll();
+        return ResponseData.success(list);
+    }
+
     /**
      * 添加设备
      */
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index f33d4b0..beb9786 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -22,4 +22,6 @@
     Boolean clearDoorCode(@Param("doorCode")String doorCode);
 
     List<Device> selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType);
+
+    List<Map<String,Object>> selectListAll();
 }
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 331b6fa..234e081 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -47,6 +47,20 @@
         </where>
     </select>
 
+    <select id="selectListAll" resultType="map">
+        SELECT
+            bd.ID AS id,
+            bd.DEV_CODE AS devCode,
+            bd.DEV_TYPE AS devType,
+            bd.DOOR_CODE AS doorCode,
+            ad.DOOR_NAME AS doorName,
+            bd.INOUT_TYPE AS inoutType,
+            bd.DESCRIPTION AS description
+        FROM
+            bus_device bd
+            LEFT JOIN acs_door ad ON bd.DOOR_CODE = ad.DOOR_CODE
+    </select>
+
 
 
 </mapper>

diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 2a6cd31..1bcf678 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -82,6 +82,13 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/listAllLabel")
+    @ResponseBody
+    public Object listAllLabel() {
+        List<Map<String,Object>> list = deviceService.selectListAll();
+        return ResponseData.success(list);
+    }
+
     /**
      * 添加设备
      */
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index f33d4b0..beb9786 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -22,4 +22,6 @@
     Boolean clearDoorCode(@Param("doorCode")String doorCode);
 
     List<Device> selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType);
+
+    List<Map<String,Object>> selectListAll();
 }
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 331b6fa..234e081 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -47,6 +47,20 @@
         </where>
     </select>
 
+    <select id="selectListAll" resultType="map">
+        SELECT
+            bd.ID AS id,
+            bd.DEV_CODE AS devCode,
+            bd.DEV_TYPE AS devType,
+            bd.DOOR_CODE AS doorCode,
+            ad.DOOR_NAME AS doorName,
+            bd.INOUT_TYPE AS inoutType,
+            bd.DESCRIPTION AS description
+        FROM
+            bus_device bd
+            LEFT JOIN acs_door ad ON bd.DOOR_CODE = ad.DOOR_CODE
+    </select>
+
 
 
 </mapper>
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index b50f494..122cc0c 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -29,4 +29,6 @@
       List<Integer> batchUpdateDB(List<Integer> ids);
 
       List<Device> selectDeviceByType(String devType);
+
+      List<Map<String,Object>> selectListAll();
 }

diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
index 2a6cd31..1bcf678 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java
@@ -82,6 +82,13 @@
         return ResponseData.success(list);
     }
 
+    @RequestMapping(value = "/listAllLabel")
+    @ResponseBody
+    public Object listAllLabel() {
+        List<Map<String,Object>> list = deviceService.selectListAll();
+        return ResponseData.success(list);
+    }
+
     /**
      * 添加设备
      */
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index f33d4b0..beb9786 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -22,4 +22,6 @@
     Boolean clearDoorCode(@Param("doorCode")String doorCode);
 
     List<Device> selectListByDevType(@Param("dataScope")DataScope dataScope, @Param("devType")String devType);
+
+    List<Map<String,Object>> selectListAll();
 }
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index 331b6fa..234e081 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -47,6 +47,20 @@
         </where>
     </select>
 
+    <select id="selectListAll" resultType="map">
+        SELECT
+            bd.ID AS id,
+            bd.DEV_CODE AS devCode,
+            bd.DEV_TYPE AS devType,
+            bd.DOOR_CODE AS doorCode,
+            ad.DOOR_NAME AS doorName,
+            bd.INOUT_TYPE AS inoutType,
+            bd.DESCRIPTION AS description
+        FROM
+            bus_device bd
+            LEFT JOIN acs_door ad ON bd.DOOR_CODE = ad.DOOR_CODE
+    </select>
+
 
 
 </mapper>
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
index b50f494..122cc0c 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java
@@ -29,4 +29,6 @@
       List<Integer> batchUpdateDB(List<Integer> ids);
 
       List<Device> selectDeviceByType(String devType);
+
+      List<Map<String,Object>> selectListAll();
 }
diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index cbd81e8..2b91f30 100644
--- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -90,4 +90,27 @@
         }
         return this.selectList(query);
     }
+
+    @Override
+    public List<Map<String, Object>> selectListAll() {
+        List<Map<String, Object>> list = this.baseMapper.selectListAll();
+        for (Map<String, Object> device : list) {
+            String label = "";
+            if(ToolUtil.isNotEmpty(device.get("doorName"))) {
+                String doorName = device.get("doorName").toString();
+                String inoutType = device.get("inoutType").toString();
+                if("0".equals(inoutType)){
+                    label = doorName + "出门设备";
+                }
+                if("1".equals(inoutType)) {
+                    label = doorName + "进门设备";
+                }
+            } else if(ToolUtil.isNotEmpty(device.get("description"))){
+                String description = device.get("description").toString();
+                label = description;
+            }
+            device.put("label",label);
+        }
+        return list;
+    }
 }