修复未激活设备无法获取标签信息

duyanghao · Jan 13, 2022 · 888f776 · 888f776
1 parent 1794e3d
commit 888f776
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/...ger/device-manager/src/main/java/org/jetlinks/community/device/response/DeviceDetail.java b/...ger/device-manager/src/main/java/org/jetlinks/community/device/response/DeviceDetail.java
@@ -12,6 +12,8 @@
 import org.jetlinks.core.Values;
 import org.jetlinks.core.device.DeviceOperator;
 import org.jetlinks.core.metadata.ConfigPropertyMetadata;
+import org.jetlinks.core.metadata.DeviceMetadata;
+import org.jetlinks.supports.official.JetLinksDeviceMetadataCodec;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
@@ -127,9 +129,29 @@ public class DeviceDetail {
     public DeviceDetail notActive() {
 
         state = DeviceState.notActive;
+        initTags();
         return this;
     }
 
+    private DeviceMetadata decodeMetadata() {
+        if (StringUtils.isEmpty(metadata)) {
+            return null;
+        }
+        return JetLinksDeviceMetadataCodec.getInstance().doDecode(metadata);
+    }
+
+    private void initTags() {
+        DeviceMetadata metadata = decodeMetadata();
+        if (null != metadata) {
+            with(metadata
+                     .getTags()
+                     .stream()
+                     .map(DeviceTagEntity::of)
+                     .collect(Collectors.toList()));
+        }
+    }
+
+
     public Mono<DeviceDetail> with(DeviceOperator operator, List<ConfigPropertyMetadata> configs) {
         return Mono
             .zip(
@@ -140,7 +162,7 @@ public Mono<DeviceDetail> with(DeviceOperator operator, List<ConfigPropertyMetad
                 //T3: 离线时间
                 operator.getOfflineTime().defaultIfEmpty(0L),
                 //T4: 物模型
-                operator.getMetadata(),
+                operator.getMetadata().switchIfEmpty(Mono.fromSupplier(this::decodeMetadata)),
                 //T5: 真实的配置信息
                 operator.getSelfConfigs(configs
                                             .stream()