更新！

src/main/java/com/github/microservice/models/device/DeviceInfoSyncParam.java

@@ -1,9 +1,9 @@
 package com.github.microservice.models.device;
 
 import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceSpecType;
-import com.github.microservice.models.type.DeviceState;
-import com.github.microservice.models.type.DeviceType;
+import com.github.microservice.types.deviceUse.DeviceSpecType;
+import com.github.microservice.types.deviceUse.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/device/GateWaySyncParam.java

@@ -1,8 +1,6 @@
 package com.github.microservice.models.device;
 
-import cn.hutool.json.JSONObject;
-import com.github.microservice.models.type.DeviceType;
-import com.github.microservice.models.type.OnLineState;
+import com.github.microservice.types.deviceUse.OnLineState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/hxz/ConsumTransactionsModel.java

@@ -1,7 +1,7 @@
 package com.github.microservice.models.hxz;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.github.microservice.models.type.OrderFromType;
+import com.github.microservice.types.deviceUse.OrderFromType;
 import com.github.microservice.types.payment.PaymentType;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;

src/main/java/com/github/microservice/models/hxz/DevicePingInfoParam.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.hxz;
 
-import com.github.microservice.models.type.DeviceState;
+import com.github.microservice.types.deviceUse.DeviceState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

src/main/java/com/github/microservice/models/project/ProjectSyncParam.java

@@ -1,6 +1,6 @@
 package com.github.microservice.models.project;
 
-import com.github.microservice.models.type.CommonState;
+import com.github.microservice.types.common.CommonState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/github/microservice/models/type/CommonState.java → src/main/java/com/github/microservice/types/common/CommonState.java

@@ -1,8 +1,9 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.common;
 
 import lombok.Getter;
 
 /**
+ *
  */
 public enum CommonState {
     Enable("可用"),

src/main/java/com/github/microservice/types/deviceUse/DeviceCategory.java

@@ -0,0 +1,20 @@
+package com.github.microservice.types.deviceUse;
+
+import lombok.Getter;
+
+/**
+ * 产品品类
+ */
+public enum DeviceCategory {
+    DC("直连设备"),
+    DE("网关子设备"),
+    GW("网关设备"),
+    ;
+
+    @Getter
+    private String remark;
+
+    DeviceCategory(String remark) {
+        this.remark = remark;
+    }
+}

src/main/java/com/github/microservice/models/type/DeviceSpecType.java → src/main/java/com/github/microservice/types/deviceUse/DeviceSpecType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 
@@ -6,6 +6,7 @@ import lombok.Getter;
  * 设备型号/规格
  */
 public enum DeviceSpecType {
+    Common("通用"),
     CloudConsumer("云版消费机"),
     ;
 

src/main/java/com/github/microservice/models/type/DeviceState.java → src/main/java/com/github/microservice/types/deviceUse/DeviceState.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/DeviceType.java → src/main/java/com/github/microservice/types/deviceUse/DeviceType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/LogServiceType.java → src/main/java/com/github/microservice/types/deviceUse/LogServiceType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/OnLineDeviceType.java → src/main/java/com/github/microservice/types/deviceUse/OnLineDeviceType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/OnLineState.java → src/main/java/com/github/microservice/types/deviceUse/OnLineState.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/OrderFromType.java → src/main/java/com/github/microservice/types/deviceUse/OrderFromType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 

src/main/java/com/github/microservice/models/type/RegistType.java → src/main/java/com/github/microservice/types/deviceUse/RegistType.java

@@ -1,4 +1,4 @@
-package com.github.microservice.models.type;
+package com.github.microservice.types.deviceUse;
 
 import lombok.Getter;
 
@@ -6,7 +6,7 @@ import lombok.Getter;
  * 设备注册方式
  */
 public enum RegistType {
-    Gateway("消费机"),
+    Gateway("网关"),
     DirectConnection("直连"),
     ManuallyAdd("手动维护");
 

src/main/java/com/github/microservice/types/deviceUse/ThingType.java

@@ -0,0 +1,19 @@
+package com.github.microservice.types.deviceUse;
+
+import lombok.Getter;
+
+/**
+ * 物模型类型
+ */
+public enum ThingType {
+    Auto("自动关联"),
+    Manual("手动创建"),
+    ;
+
+    @Getter
+    private String remark;
+
+    ThingType(String remark) {
+        this.remark = remark;
+    }
+}