设备日志增加消息ID

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/entity/DeviceOperationLogEntity.java

@@ -47,6 +47,9 @@ public class DeviceOperationLogEntity {
     @Schema(description = "数据时间")
     private long timestamp;
 
+    @Schema(description = "消息ID")
+    private String messageId;
+
     public Map<String, Object> toSimpleMap() {
         Map<String, Object> result = (Map) JSON.toJSON(this);
         result.put("type", type.getValue());

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/service/data/AbstractDeviceDataStoragePolicy.java

@@ -130,6 +130,7 @@ public abstract class AbstractDeviceDataStoragePolicy implements DeviceDataStora
         operationLog.setTimestamp(message.getTimestamp());
         operationLog.setCreateTime(System.currentTimeMillis());
         operationLog.setProductId(productId);
+        operationLog.setMessageId(message.getMessageId());
         operationLog.setType(DeviceLogType.of(message));
 
         if (null != logEntityConsumer) {

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/timeseries/DeviceLogTimeSeriesMetadata.java

@@ -57,7 +57,7 @@ class DeviceLogTimeSeriesMetadata implements TimeSeriesMetadata {
             SimplePropertyMetadata property = new SimplePropertyMetadata();
             property.setId("productId");
             property.setValueType(new StringType());
-            property.setName("型号ID");
+            property.setName("产品ID");
             metadata.add(property);
         }
 
@@ -69,6 +69,14 @@ class DeviceLogTimeSeriesMetadata implements TimeSeriesMetadata {
             metadata.add(property);
         }
 
+
+        {
+            SimplePropertyMetadata property = new SimplePropertyMetadata();
+            property.setId("messageId");
+            property.setValueType(StringType.GLOBAL);
+            property.setName("消息ID");
+            metadata.add(property);
+        }
         {
             SimplePropertyMetadata property = new SimplePropertyMetadata();
             property.setId("createTime");