瀏覽代碼

设备日志存储新增唯一标识字段

liujq 5 年之前
父節點
當前提交
d9ae571151

+ 10 - 9
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/message/writer/ElasticDeviceMessageWriterConnector.java

@@ -3,11 +3,19 @@ package org.jetlinks.community.device.message.writer;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
+import org.hswebframework.web.id.IDGenerator;
+import org.jetlinks.community.device.enums.DeviceLogType;
+import org.jetlinks.community.device.events.handler.DeviceEventIndex;
+import org.jetlinks.community.device.events.handler.DeviceIndexProvider;
+import org.jetlinks.community.device.events.handler.ValueTypeTranslator;
+import org.jetlinks.community.device.logger.DeviceOperationLog;
+import org.jetlinks.community.device.message.DeviceMessageUtils;
+import org.jetlinks.community.elastic.search.service.ElasticSearchService;
+import org.jetlinks.community.gateway.*;
 import org.jetlinks.core.device.DeviceRegistry;
 import org.jetlinks.core.message.DeviceMessage;
 import org.jetlinks.core.message.DeviceOfflineMessage;
 import org.jetlinks.core.message.DeviceOnlineMessage;
-import org.jetlinks.core.message.Headers;
 import org.jetlinks.core.message.event.EventMessage;
 import org.jetlinks.core.message.function.FunctionInvokeMessageReply;
 import org.jetlinks.core.message.property.ReadPropertyMessageReply;
@@ -20,14 +28,6 @@ import org.jetlinks.core.metadata.types.DateTimeType;
 import org.jetlinks.core.metadata.types.NumberType;
 import org.jetlinks.core.metadata.types.ObjectType;
 import org.jetlinks.core.metadata.types.UnknownType;
-import org.jetlinks.community.device.enums.DeviceLogType;
-import org.jetlinks.community.device.events.handler.DeviceEventIndex;
-import org.jetlinks.community.device.events.handler.DeviceIndexProvider;
-import org.jetlinks.community.device.events.handler.ValueTypeTranslator;
-import org.jetlinks.community.device.logger.DeviceOperationLog;
-import org.jetlinks.community.device.message.DeviceMessageUtils;
-import org.jetlinks.community.elastic.search.service.ElasticSearchService;
-import org.jetlinks.community.gateway.*;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -98,6 +98,7 @@ public class ElasticDeviceMessageWriterConnector
         String productId = (String) headers.get("productId");
 
         DeviceOperationLog operationLog = new DeviceOperationLog();
+        operationLog.setId(IDGenerator.MD5.generate());
         operationLog.setDeviceId(message.getDeviceId());
         operationLog.setCreateTime(new Date(message.getTimestamp()));
         operationLog.setProductId(productId);