Shikong/gb28181-docking-platform-mocking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

Browse Source
This commit is contained in:
shikong 2023-09-12 17:27:04 +08:00
parent 23782c0f8c
commit 137b96bbf7
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gb28181-mocking-api/src/main/java/cn/skcks/docking/gb28181/mocking/api/gb28181/Gb28181Controller.java
View File

@ -11,6 +11,7 @@ import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult;
@Slf4j @Slf4j
@Tag(name = "设备信息") @Tag(name = "设备信息")
@ -25,7 +26,7 @@ public class Gb28181Controller {
} }
@GetJson("/register") @GetJson("/register")
public JsonResponse<Boolean> register(){ public DeferredResult<JsonResponse<Boolean>> register(){
return JsonResponse.success(registerService.register()); return registerService.register();
} }
} }

5
gb28181-mocking-service/src/main/java/cn/skcks/docking/gb28181/mocking/core/sip/sender/SipSender.java
View File

@ -40,8 +40,9 @@ public class SipSender {
} }
ListeningPoint listeningPoint = listeningPoints[0]; ListeningPoint listeningPoint = listeningPoints[0];
String ip = listeningPoint.getIPAddress(); String ip = listeningPoint.getIPAddress();
int port = listeningPoint.getPort();
try { try {
sipProvider.sendRequest(request.build(sipProvider, ip)); sipProvider.sendRequest(request.build(sipProvider, ip, port));
} catch (SipException e) { } catch (SipException e) {
log.error("向{} {}:{} 发送请求失败, 异常: {}", ip, listeningPoint.getPort(), listeningPoint.getTransport(), e.getMessage()); log.error("向{} {}:{} 发送请求失败, 异常: {}", ip, listeningPoint.getPort(), listeningPoint.getTransport(), e.getMessage());
} }
@ -49,6 +50,6 @@ public class SipSender {
} }
public interface SendRequest { public interface SendRequest {
Request build(SipProvider provider, String ip); Request build(SipProvider provider, String ip, int port);
} }
} }

26
gb28181-mocking-service/src/main/java/cn/skcks/docking/gb28181/mocking/service/gb28181/register/RegisterService.java
View File

@ -1,33 +1,37 @@
package cn.skcks.docking.gb28181.mocking.service.gb28181.register; package cn.skcks.docking.gb28181.mocking.service.gb28181.register;
import cn.skcks.docking.gb28181.core.sip.listener.SipListener; import cn.skcks.docking.gb28181.common.json.JsonResponse;
import cn.skcks.docking.gb28181.core.sip.service.SipService;
import cn.skcks.docking.gb28181.core.sip.utils.SipUtil; import cn.skcks.docking.gb28181.core.sip.utils.SipUtil;
import cn.skcks.docking.gb28181.mocking.config.sip.SipConfig;
import cn.skcks.docking.gb28181.mocking.core.sip.request.SipRequestBuilder; import cn.skcks.docking.gb28181.mocking.core.sip.request.SipRequestBuilder;
import cn.skcks.docking.gb28181.mocking.core.sip.sender.SipSender; import cn.skcks.docking.gb28181.mocking.core.sip.sender.SipSender;
import cn.skcks.docking.gb28181.mocking.orm.mybatis.dynamic.model.MockingDevice;
import cn.skcks.docking.gb28181.mocking.service.device.DeviceService; import cn.skcks.docking.gb28181.mocking.service.device.DeviceService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.context.request.async.DeferredResult;
import java.util.List;
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class RegisterService { public class RegisterService {
private final SipConfig sipConfig;
private final SipListener sipListener;
private final SipService sipService;
private final DeviceService deviceService; private final DeviceService deviceService;
private final SipSender sender; private final SipSender sender;
public boolean register(){ @SneakyThrows
deviceService.getAllDevice().parallelStream().forEach(device -> { public DeferredResult<JsonResponse<Boolean>> register(){
sender.sendRequest((provider, ip) -> SipRequestBuilder.createRegisterRequest(device, ip, sipConfig.getPort(), 1, SipUtil.generateFromTag(), null, provider.getNewCallId())); DeferredResult<JsonResponse<Boolean>> result = new DeferredResult<>();
}); List<MockingDevice> allDevice = deviceService.getAllDevice();
allDevice.parallelStream().forEach(device -> {
sender.sendRequest((provider, ip, port) -> SipRequestBuilder.createRegisterRequest(device, ip, port, 1, SipUtil.generateFromTag(), null, provider.getNewCallId()));
return true; });
result.setResult(JsonResponse.success(true));
return result;
} }
} }