Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化报警推送心跳定时任务

pull/1669/head
648540858 2024-10-29 09:22:04 +08:00
parent bf9262283e
commit caaaaacb89
3 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/genersoft/iot/vmp/gb28181/controller/SseController.java
View File

@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.controller; package com.genersoft.iot.vmp.gb28181.controller;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener; import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -28,6 +29,9 @@ public class SseController {
@Resource @Resource
private AlarmEventListener alarmEventListener; private AlarmEventListener alarmEventListener;
@Resource
private DynamicTask dynamicTask;
/** /**
* SSE 推送. * SSE 推送.
* *
@ -45,11 +49,13 @@ public class SseController {
PrintWriter writer = response.getWriter(); PrintWriter writer = response.getWriter();
alarmEventListener.addSseEmitter(browserId, writer); alarmEventListener.addSseEmitter(browserId, writer);
while (!writer.checkError()) { dynamicTask.startCron("sse-key", new Runnable() {
Thread.sleep(1000); @Override
writer.write(":keep alive\n\n"); public void run() {
writer.flush(); writer.write(":keep alive\n\n");
} writer.flush();
}
}, 1000);
alarmEventListener.removeSseEmitter(browserId, writer); alarmEventListener.removeSseEmitter(browserId, writer);
} }
} }

31
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
View File

@ -7,14 +7,13 @@ import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.GbSipDate; import com.genersoft.iot.vmp.gb28181.bean.GbSipDate;
import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo; import com.genersoft.iot.vmp.gb28181.bean.RemoteAddressInfo;
import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo; import com.genersoft.iot.vmp.gb28181.bean.SipTransactionInfo;
import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver; import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
import com.genersoft.iot.vmp.gb28181.transmit.SIPSender; import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor; import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent; import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.utils.SipUtils; import com.genersoft.iot.vmp.gb28181.utils.SipUtils;
import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
import com.genersoft.iot.vmp.utils.DateUtil; import com.genersoft.iot.vmp.utils.DateUtil;
import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.address.AddressImpl; import gov.nist.javax.sip.address.AddressImpl;
import gov.nist.javax.sip.address.SipUri; import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.header.SIPDateHeader; import gov.nist.javax.sip.header.SIPDateHeader;
@ -77,9 +76,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
@Override @Override
public void process(RequestEvent evt) { public void process(RequestEvent evt) {
try { try {
RequestEventExt evtExt = (RequestEventExt) evt; SIPRequest request = (SIPRequest) evt.getRequest();
SIPRequest request = (SIPRequest)evt.getRequest();
Response response = null; Response response = null;
boolean passwordCorrect = false; boolean passwordCorrect = false;
// 注册标志 // 注册标志
@ -98,12 +95,12 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request, RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
userSetting.getSipUseSourceIpAsRemoteAddress()); userSetting.getSipUseSourceIpAsRemoteAddress());
String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort(); String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
String title = registerFlag ? "[注册请求]": "[注销请求]"; String title = registerFlag ? "[注册请求]" : "[注销请求]";
log.info(title + "设备：{}, 开始处理: {}", deviceId, requestAddress); log.info(title + "设备：{}, 开始处理: {}", deviceId, requestAddress);
if (device != null && if (device != null &&
device.getSipTransactionInfo() != null && device.getSipTransactionInfo() != null &&
request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) { request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
log.info(title + "设备：{}, 注册续订: {}",device.getDeviceId(), device.getDeviceId()); log.info(title + "设备：{}, 注册续订: {}", device.getDeviceId(), device.getDeviceId());
if (registerFlag) { if (registerFlag) {
device.setExpires(request.getExpires().getExpires()); device.setExpires(request.getExpires().getExpires());
device.setIp(remoteAddressInfo.getIp()); device.setIp(remoteAddressInfo.getIp());
@ -118,17 +115,17 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP"); device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), registerOkResponse); sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), registerOkResponse);
device.setRegisterTime(DateUtil.getNow()); device.setRegisterTime(DateUtil.getNow());
SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse)registerOkResponse); SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse) registerOkResponse);
deviceService.online(device, sipTransactionInfo); deviceService.online(device, sipTransactionInfo);
}else { } else {
deviceService.offline(deviceId, "主动注销"); deviceService.offline(deviceId, "主动注销");
} }
return; return;
} }
String password = (device != null && !ObjectUtils.isEmpty(device.getPassword()))? device.getPassword() : sipConfig.getPassword(); String password = (device != null && !ObjectUtils.isEmpty(device.getPassword())) ? device.getPassword() : sipConfig.getPassword();
AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME); AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
if (authHead == null && !ObjectUtils.isEmpty(password)) { if (authHead == null && !ObjectUtils.isEmpty(password)) {
log.info(title + " 设备：{}, 回复401: {}",deviceId, requestAddress); log.info(title + " 设备：{}, 回复401: {}", deviceId, requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request); response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain()); new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response); sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
@ -175,7 +172,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
device.setMediaServerId("auto"); device.setMediaServerId("auto");
device.setDeviceId(deviceId); device.setDeviceId(deviceId);
device.setOnLine(false); device.setOnLine(false);
}else { } else {
if (ObjectUtils.isEmpty(device.getStreamMode())) { if (ObjectUtils.isEmpty(device.getStreamMode())) {
device.setStreamMode("UDP"); device.setStreamMode("UDP");
} }
@ -208,12 +205,12 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
// 注册成功 // 注册成功
// 保存到redis // 保存到redis
if (registerFlag) { if (registerFlag) {
log.info("[注册成功] deviceId: {}->{}", deviceId, requestAddress); log.info("[注册成功] deviceId: {}->{}", deviceId, requestAddress);
device.setRegisterTime(DateUtil.getNow()); device.setRegisterTime(DateUtil.getNow());
SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse)response); SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse) response);
deviceService.online(device, sipTransactionInfo); deviceService.online(device, sipTransactionInfo);
} else { } else {
log.info("[注销成功] deviceId: {}->{}" ,deviceId, requestAddress); log.info("[注销成功] deviceId: {}->{}", deviceId, requestAddress);
deviceService.offline(deviceId, "主动注销"); deviceService.offline(deviceId, "主动注销");
} }
} catch (SipException | NoSuchAlgorithmException | ParseException e) { } catch (SipException | NoSuchAlgorithmException | ParseException e) {
@ -223,7 +220,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
private Response getRegisterOkResponse(Request request) throws ParseException { private Response getRegisterOkResponse(Request request) throws ParseException {
// 携带授权头并且密码正确 // 携带授权头并且密码正确
Response response = getMessageFactory().createResponse(Response.OK, request); Response response = getMessageFactory().createResponse(Response.OK, request);
// 添加date头 // 添加date头
SIPDateHeader dateHeader = new SIPDateHeader(); SIPDateHeader dateHeader = new SIPDateHeader();
// 使用自己修改的 // 使用自己修改的

2
web_src/src/layout/UiHeader.vue
View File

@ -120,7 +120,7 @@ export default {
that.$notify({ that.$notify({
title: '报警信息', title: '报警信息',
dangerouslyUseHTMLString: true, dangerouslyUseHTMLString: true,
message: `<strong>设备：</strong> <i> ${data.deviceId}</i>` + message: `<strong>设备编号：</strong> <i> ${data.deviceId}</i>` +
`<br><strong>通道编号：</strong> <i>${ data.channelId}</i>` + `<br><strong>通道编号：</strong> <i>${ data.channelId}</i>` +
`<br><strong>报警级别：</strong> <i>${ data.alarmPriorityDescription}</i>` + `<br><strong>报警级别：</strong> <i>${ data.alarmPriorityDescription}</i>` +
`<br><strong>报警方式：</strong> <i>${ data.alarmMethodDescription}</i>` + `<br><strong>报警方式：</strong> <i>${ data.alarmMethodDescription}</i>` +