Przeglądaj źródła

add 通道更新

18339543638 3 lat temu
rodzic
commit
3762da5cb4

+ 1 - 1
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/controller/MediaDeviceController.java

@@ -55,7 +55,7 @@ public class MediaDeviceController implements ReactiveServiceCrudController<Medi
 
 
 
-    @PostMapping("/{deviceId}/channels/sync")
+    @PostMapping("/{deviceId}/channels/_sync")
     @CreateAction
     @Operation(summary = "更新通道")
     public Mono<Object> getDeviceDetailInfo(@PathVariable("deviceId") @Parameter(description = "设备ID") String id) {

+ 3 - 0
jetlinks-manager/media-manager/src/main/java/org/jetlinks/community/media/service/LocalMediaDeviceService.java

@@ -1,5 +1,6 @@
 package org.jetlinks.community.media.service;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +35,8 @@ import reactor.core.publisher.Mono;
 
 import java.lang.management.MemoryNotificationInfo;
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;

+ 5 - 2
jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/DefaultDeviceSessionManager.java

@@ -102,7 +102,11 @@ public class DefaultDeviceSessionManager implements DeviceSessionManager {
         return counter == null ? 0 : counter.longValue();
     }
 
-    public Mono<Long> checkSession() {
+    /**
+     * 检查自身session
+     * @return
+     */
+    private Mono<Long> checkSession() {
         AtomicLong startWith = new AtomicLong();
         return Flux.fromIterable(repository.values())
             .distinct()
@@ -167,7 +171,6 @@ public class DefaultDeviceSessionManager implements DeviceSessionManager {
                 .onErrorContinue((err, val) -> log.error(err.getMessage(), err)))
             .subscribe();
 
-
         unregisterHandler
             .publishOn(Schedulers.parallel())
             .flatMap(session -> {