From caaaaacb894cdc7238a0b400622ff1c58e7201d1 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 29 Oct 2024 09:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=AD=A6=E6=8E=A8?=
=?UTF-8?q?=E9=80=81=E5=BF=83=E8=B7=B3=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../vmp/gb28181/controller/SseController.java | 16 +++++++---
.../impl/RegisterRequestProcessor.java | 31 +++++++++----------
web_src/src/layout/UiHeader.vue | 2 +-
3 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/SseController.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/SseController.java
index 2ca1a4db..b9610647 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/SseController.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/SseController.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.gb28181.controller;
+import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
@@ -28,6 +29,9 @@ public class SseController {
@Resource
private AlarmEventListener alarmEventListener;
+ @Resource
+ private DynamicTask dynamicTask;
+
/**
* SSE 推送.
*
@@ -45,11 +49,13 @@ public class SseController {
PrintWriter writer = response.getWriter();
alarmEventListener.addSseEmitter(browserId, writer);
- while (!writer.checkError()) {
- Thread.sleep(1000);
- writer.write(":keep alive\n\n");
- writer.flush();
- }
+ dynamicTask.startCron("sse-key", new Runnable() {
+ @Override
+ public void run() {
+ writer.write(":keep alive\n\n");
+ writer.flush();
+ }
+ }, 1000);
alarmEventListener.removeSseEmitter(browserId, writer);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 7c920544..44a3eb1e 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -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.RemoteAddressInfo;
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.SIPSender;
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.utils.SipUtils;
-import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
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.SipUri;
import gov.nist.javax.sip.header.SIPDateHeader;
@@ -77,9 +76,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
@Override
public void process(RequestEvent evt) {
try {
- RequestEventExt evtExt = (RequestEventExt) evt;
-
- SIPRequest request = (SIPRequest)evt.getRequest();
+ SIPRequest request = (SIPRequest) evt.getRequest();
Response response = null;
boolean passwordCorrect = false;
// 注册标志
@@ -98,12 +95,12 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
userSetting.getSipUseSourceIpAsRemoteAddress());
String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
- String title = registerFlag ? "[注册请求]": "[注销请求]";
- log.info(title + "设备：{}, 开始处理: {}", deviceId, requestAddress);
+ String title = registerFlag ? "[注册请求]" : "[注销请求]";
+ log.info(title + "设备：{}, 开始处理: {}", deviceId, requestAddress);
if (device != null &&
device.getSipTransactionInfo() != null &&
request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
- log.info(title + "设备：{}, 注册续订: {}",device.getDeviceId(), device.getDeviceId());
+ log.info(title + "设备：{}, 注册续订: {}", device.getDeviceId(), device.getDeviceId());
if (registerFlag) {
device.setExpires(request.getExpires().getExpires());
device.setIp(remoteAddressInfo.getIp());
@@ -118,17 +115,17 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), registerOkResponse);
device.setRegisterTime(DateUtil.getNow());
- SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse)registerOkResponse);
+ SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse) registerOkResponse);
deviceService.online(device, sipTransactionInfo);
- }else {
+ } else {
deviceService.offline(deviceId, "主动注销");
}
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);
if (authHead == null && !ObjectUtils.isEmpty(password)) {
- log.info(title + " 设备：{}, 回复401: {}",deviceId, requestAddress);
+ log.info(title + " 设备：{}, 回复401: {}", deviceId, requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
@@ -175,7 +172,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
device.setMediaServerId("auto");
device.setDeviceId(deviceId);
device.setOnLine(false);
- }else {
+ } else {
if (ObjectUtils.isEmpty(device.getStreamMode())) {
device.setStreamMode("UDP");
}
@@ -208,12 +205,12 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
// 注册成功
// 保存到redis
if (registerFlag) {
- log.info("[注册成功] deviceId: {}->{}", deviceId, requestAddress);
+ log.info("[注册成功] deviceId: {}->{}", deviceId, requestAddress);
device.setRegisterTime(DateUtil.getNow());
- SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse)response);
+ SipTransactionInfo sipTransactionInfo = new SipTransactionInfo((SIPResponse) response);
deviceService.online(device, sipTransactionInfo);
} else {
- log.info("[注销成功] deviceId: {}->{}" ,deviceId, requestAddress);
+ log.info("[注销成功] deviceId: {}->{}", deviceId, requestAddress);
deviceService.offline(deviceId, "主动注销");
}
} catch (SipException | NoSuchAlgorithmException | ParseException e) {
@@ -223,7 +220,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
private Response getRegisterOkResponse(Request request) throws ParseException {
// 携带授权头并且密码正确
- Response response = getMessageFactory().createResponse(Response.OK, request);
+ Response response = getMessageFactory().createResponse(Response.OK, request);
// 添加date头
SIPDateHeader dateHeader = new SIPDateHeader();
// 使用自己修改的
diff --git a/web_src/src/layout/UiHeader.vue b/web_src/src/layout/UiHeader.vue
index 6912c7fb..1b753aec 100755
--- a/web_src/src/layout/UiHeader.vue
+++ b/web_src/src/layout/UiHeader.vue
@@ -120,7 +120,7 @@ export default {
that.$notify({
title: '报警信息',
dangerouslyUseHTMLString: true,
- message: `设备： ${data.deviceId}` +
+ message: `设备编号： ${data.deviceId}` +
`
通道编号： ${ data.channelId}` +
`
报警级别： ${ data.alarmPriorityDescription}` +
`
报警方式： ${ data.alarmMethodDescription}` +