From 9113b2bd18c3a916eef8b7e9350efb64bddbdc8a Mon Sep 17 00:00:00 2001
From: zhouhao <zh.sqy@qq.com>
Date: Thu, 5 Mar 2020 19:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B1=BB=E5=9E=8B=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/timeseries/DeviceEventTimeSeriesMetadata.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/timeseries/DeviceEventTimeSeriesMetadata.java b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/timeseries/DeviceEventTimeSeriesMetadata.java
index 4ba5b9aa..6967649a 100644
--- a/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/timeseries/DeviceEventTimeSeriesMetadata.java
+++ b/jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/timeseries/DeviceEventTimeSeriesMetadata.java
@@ -1,5 +1,6 @@
 package org.jetlinks.community.device.timeseries;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.jetlinks.core.metadata.DataType;
 import org.jetlinks.core.metadata.EventMetadata;
 import org.jetlinks.core.metadata.PropertyMetadata;
@@ -48,7 +49,7 @@ class DeviceEventTimeSeriesMetadata implements TimeSeriesMetadata {
     public DeviceEventTimeSeriesMetadata(String productId, EventMetadata eventMetadata) {
         metric = DeviceTimeSeriesMetric.deviceEventMetric(productId, eventMetadata.getId());
         DataType type = eventMetadata.getType();
-        if (type instanceof ObjectType) {
+        if (CollectionUtils.isNotEmpty(((ObjectType) type).getProperties())) {
             metadata.addAll(((ObjectType) type).getProperties());
         } else {
             SimplePropertyMetadata property = new SimplePropertyMetadata();