增加日志类型

jetlinks-components/elasticsearch-component/src/main/java/org/jetlinks/community/elastic/search/service/DefaultElasticSearchService.java

@@ -179,7 +179,7 @@ public class DefaultElasticSearchService implements ElasticSearchService {
                     .zipWith(indexManager.getIndexMetadata(index))
                     .flatMapMany(tp2 ->
                         group.map(buffer -> {
-                            IndexRequest request = new IndexRequest(tp2.getT1(),"_doc");
+                            IndexRequest request = new IndexRequest(tp2.getT1(), "_doc");
                             Object o = JSON.toJSON(buffer.getPayload());
                             if (o instanceof Map) {
                                 request.source(tp2.getT2().convertToElastic((Map<String, Object>) o));
@@ -194,9 +194,9 @@ public class DefaultElasticSearchService implements ElasticSearchService {
             .flatMap(lst -> {
                 BulkRequest request = new BulkRequest();
                 lst.forEach(request::add);
-                return ReactorActionListener.<BulkResponse>mono(listener -> {
-                    restClient.getWriteClient().bulkAsync(request, RequestOptions.DEFAULT, listener);
-                });
+                return ReactorActionListener.<BulkResponse>mono(listener ->
+                    restClient.getWriteClient().bulkAsync(request, RequestOptions.DEFAULT, listener)
+                );
             }).thenReturn(buffers.size());
     }
 

jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/enums/DeviceLogType.java

@@ -14,10 +14,13 @@ public enum DeviceLogType implements EnumDict<String> {
     writeProperty("属性修改"),
     reportProperty("属性上报"),
     child("子设备消息"),
+    childReply("子设备消息回复"),
     functionInvoke("调用功能"),
     readPropertyReply("读取属性回复"),
     writePropertyReply("修改属性回复"),
     functionReply("调用功能回复"),
+    register("设备注册"),
+    unregister("设备注销"),
 
     offline("离线"),
     online("上线"),
@@ -31,7 +34,6 @@ public enum DeviceLogType implements EnumDict<String> {
         return name();
     }
 
-
     public static DeviceLogType of(DeviceMessage message) {
         switch (message.getMessageType()) {
             case EVENT:
@@ -42,6 +44,8 @@ public enum DeviceLogType implements EnumDict<String> {
                 return offline;
             case CHILD:
                 return child;
+            case CHILD_REPLY:
+                return childReply;
             case REPORT_PROPERTY:
                 return reportProperty;
             case INVOKE_FUNCTION_REPLY:
@@ -50,10 +54,13 @@ public enum DeviceLogType implements EnumDict<String> {
                 return readPropertyReply;
             case WRITE_PROPERTY_REPLY:
                 return writePropertyReply;
+            case REGISTER:
+                return register;
+            case UN_REGISTER:
+                return unregister;
             default:
                 return other;
         }
-
     }