diff --git a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
index e4efbee..a36994e 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/controller/DeseCabinetController.java
@@ -49,6 +49,13 @@ public class DeseCabinetController {
         return ApiResponse.success(ResponseStatus.SUCCESS);
     }
 
+
+
+    /**
+     * 必填字段验证
+     *
+     * @param deseCabinetDto /
+     */
     private void verifyValues(@RequestBody DeseCabinetDto deseCabinetDto) {
         if (deseCabinetDto.getAreaNo() != null
                 && deseCabinetDto.getRowNo() != null
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java
index 1b4fe86..7675d17 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceInfo.java
@@ -37,6 +37,11 @@ public class DeviceInfo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "库房id")
     private Storeroom storeroomId;
 
+    @OneToOne
+    @JoinColumn(name = "device_type_id",referencedColumnName = "id")
+    @ApiModelProperty(value = "设备类型id")
+    private DeviceType deviceTypeId;
+
     @Column(name = "device_name")
     @ApiModelProperty(value = "设备名称")
     private String deviceName;
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceType.java b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceType.java
new file mode 100644
index 0000000..618be09
--- /dev/null
+++ b/storeroom/src/main/java/com/storeroom/modules/device/domain/DeviceType.java
@@ -0,0 +1,45 @@
+package com.storeroom.modules.device.domain;
+
+
+import com.storeroom.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Objects;
+
+@Entity
+@Getter
+@Setter
+@Table(name = "device_type")
+public class DeviceType extends BaseEntity implements Serializable {
+
+    @Id
+    @Column(name = "id")
+    @NotNull(groups = Update.class)
+    @ApiModelProperty(value = "ID", hidden = true)
+    private String id;
+
+    @Column(name = "name")
+    @ApiModelProperty(value = "类型名称",hidden = true)
+    private String name;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeviceType that = (DeviceType) o;
+        return Objects.equals(id, that.id) && Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name);
+    }
+}
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/DeseCabinetService.java b/storeroom/src/main/java/com/storeroom/modules/device/service/DeseCabinetService.java
index 54a0f0b..274d1d1 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/DeseCabinetService.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/DeseCabinetService.java
@@ -2,7 +2,9 @@ package com.storeroom.modules.device.service;
 
 import com.storeroom.modules.device.service.dto.DeseCabinetDto;
 
+
 public interface DeseCabinetService {
+
     /**
      * 设备新增
      */
@@ -18,6 +20,8 @@ public interface DeseCabinetService {
      */
     void delete(String id);
 
+
+
     /**
      * 获取状态
      * @return /
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceAllDto.java b/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceAllDto.java
new file mode 100644
index 0000000..b768532
--- /dev/null
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceAllDto.java
@@ -0,0 +1,47 @@
+package com.storeroom.modules.device.service.dto;
+
+import com.storeroom.modules.device.domain.Storeroom;
+import com.storeroom.modules.device.domain.Supplier;
+
+/**
+ * 所有设备属性
+ */
+public class DeviceAllDto {
+
+    private String id;
+
+    private Supplier supplierId;
+
+    private Storeroom storeroomId;
+
+    private String deviceName;
+
+    private String deviceIp;
+
+    private Integer devicePort;
+
+    private Integer deviceState;
+
+    private Integer sequence;
+
+    private String storeroomCode;
+
+    private String deviceId;
+
+    private Integer rowNo;
+
+    private Integer areaNo;
+
+    private Integer sumColumnNo;
+
+    private Integer firstColumnNo;
+
+    private Integer partNo;
+
+    private Integer isLinkage;
+
+    private Integer isCallback;
+
+    private Integer isNotice;
+
+}
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceInfoDto.java b/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceInfoDto.java
index 90ab115..7c0346f 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceInfoDto.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/dto/DeviceInfoDto.java
@@ -21,6 +21,7 @@ public class DeviceInfoDto extends BaseDTO implements Serializable {
 
     private Storeroom storeroomId;
 
+
     private String deviceName;
 
     private String deviceIp;
diff --git a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java
index c4ce393..37fe05f 100644
--- a/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java
+++ b/storeroom/src/main/java/com/storeroom/modules/device/service/impl/DenseCabinetImpl.java
@@ -3,7 +3,6 @@ package com.storeroom.modules.device.service.impl;
 import com.storeroom.exception.BaseException;
 import com.storeroom.modules.device.domain.DeseCabinet;
 import com.storeroom.modules.device.domain.DeviceArchivesTag;
-import com.storeroom.modules.device.domain.DeviceInfo;
 import com.storeroom.modules.device.repository.DeseCabinetRepository;
 import com.storeroom.modules.device.repository.DeviceArchivesTagRepository;
 import com.storeroom.modules.device.repository.DeviceInfoRepository;
@@ -15,7 +14,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
-import org.w3c.dom.stylesheets.LinkStyle;
 
 import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;