TRX пре 1 година
родитељ
комит
258eaec17c

+ 13 - 1
src/main/java/com/github/microservice/busInfoModel/device/DeviceInfoModel.java

@@ -3,6 +3,7 @@ package com.github.microservice.busInfoModel.device;
 import cn.hutool.json.JSONObject;
 import com.github.microservice.models.baseParam.SuperModel;
 import com.github.microservice.types.common.DataState;
+import com.github.microservice.types.deviceUse.DeviceCategory;
 import com.github.microservice.types.deviceUse.DeviceSpecType;
 import com.github.microservice.types.deviceUse.DeviceType;
 import com.github.microservice.types.deviceUse.OnLineState;
@@ -10,7 +11,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author TRX
@@ -71,6 +71,18 @@ public class DeviceInfoModel extends SuperModel {
         return "";
     }
 
+    @Schema(description = "区分是网关、设备")
+    private DeviceCategory deviceCategory;
+
+    private String deviceCategoryStr;
+
+    public String getDeviceCategoryStr() {
+        if (deviceCategory != null) {
+            return deviceCategory.getRemark();
+        }
+        return "";
+    }
+
     @Schema(description = "数据状态")
     private DataState state;