|
|
@@ -1,8 +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;
|
|
|
import org.hswebframework.web.crud.service.GenericReactiveCrudService;
|
|
|
import org.jetlinks.community.gateway.annotation.Subscribe;
|
|
|
@@ -16,30 +14,20 @@ import org.jetlinks.community.media.session.SipSession;
|
|
|
import org.jetlinks.community.media.sip.SipServerHelper;
|
|
|
import org.jetlinks.community.media.storage.impl.RedisCacheStorageImpl;
|
|
|
import org.jetlinks.community.media.transmit.cmd.SipCommander;
|
|
|
-import org.jetlinks.core.device.DeviceOperator;
|
|
|
import org.jetlinks.core.device.DeviceRegistry;
|
|
|
import org.jetlinks.core.event.EventBus;
|
|
|
import org.jetlinks.core.message.DeviceOfflineMessage;
|
|
|
-import org.jetlinks.core.message.DeviceOnlineMessage;
|
|
|
import org.jetlinks.core.message.DeviceRegisterMessage;
|
|
|
import org.jetlinks.core.message.DeviceUnRegisterMessage;
|
|
|
import org.jetlinks.core.server.session.DeviceSession;
|
|
|
import org.jetlinks.core.server.session.DeviceSessionManager;
|
|
|
import org.jetlinks.core.utils.IdUtils;
|
|
|
import org.jetlinks.supports.server.DecodedClientMessageHandler;
|
|
|
-import org.redisson.api.RedissonClient;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.boot.CommandLineRunner;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
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;
|
|
|
|
|
|
/**
|
|
|
* @author lifang
|
|
|
@@ -217,7 +205,7 @@ public class LocalMediaDeviceService extends GenericReactiveCrudService<MediaDev
|
|
|
.notIn(MediaDevice::getId,deviceIds)
|
|
|
.fetch()
|
|
|
.doOnNext(this::unRegister)
|
|
|
- .concatWith(sipServerHelper.createSip( SipServerConfig.of("34020000002000000001","192.168.104.244", 7001,"udp","340200000","GB2312","12345678",10L,"1")).then(Mono.empty()))
|
|
|
+ .concatWith(sipServerHelper.createSip( SipServerConfig.of("34020000002000000001","", "340200000","192.168.104.244",7001,"12345678","GB2312","udp","1")).then(Mono.empty()))
|
|
|
.doOnError(e->{
|
|
|
e.printStackTrace();
|
|
|
})
|
