Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复历史文件拉取异常

Browse Source
This commit is contained in:
zxb 2023-08-21 16:55:00 +08:00
parent 19f7dc21a1
commit 17278523d9
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java
View File

@ -9,12 +9,11 @@ import gov.nist.javax.sip.stack.SIPTransactionStack;
import javax.sip.SipStack; import javax.sip.SipStack;
import java.util.Properties; import java.util.Properties;
@SuppressWarnings("unused")
public class ServerLoggerImpl implements ServerLogger { public class ServerLoggerImpl implements ServerLogger {
private boolean showLog = true; private boolean showLog = true;
private SIPTransactionStack sipStack;
protected StackLogger stackLogger; protected StackLogger stackLogger;
@Override @Override
@ -27,12 +26,8 @@ public class ServerLoggerImpl implements ServerLogger {
if (!showLog) { if (!showLog) {
return; return;
} }
StringBuilder stringBuilder = new StringBuilder(); String log = (sender ? "发送: 目标 => " + to : "接收: 来自 => " + from) + "\r\n" + message;
stringBuilder.append(sender? "发送：目标--->" + from:"接收：来自--->" + to) this.stackLogger.logInfo(log);
.append("\r\n")
.append(message);
this.stackLogger.logInfo(stringBuilder.toString());
} }
@Override @Override
@ -40,11 +35,8 @@ public class ServerLoggerImpl implements ServerLogger {
if (!showLog) { if (!showLog) {
return; return;
} }
StringBuilder stringBuilder = new StringBuilder(); String log = (sender ? "发送: 目标 => " + to : "接收: 来自 => " + from) + "\r\n" + message;
stringBuilder.append(sender? "发送： 目标->" + from :"接收：来自->" + to) this.stackLogger.logInfo(log);
.append("\r\n")
.append(message);
this.stackLogger.logInfo(stringBuilder.toString());
} }
@Override @Override
@ -52,11 +44,8 @@ public class ServerLoggerImpl implements ServerLogger {
if (!showLog) { if (!showLog) {
return; return;
} }
StringBuilder stringBuilder = new StringBuilder(); String log = (sender ? "发送: 目标 => " + to : "接收: 来自 => " + from) + "\r\n" + message;
stringBuilder.append(sender? "发送： 目标->" + from :"接收：来自->" + to) this.stackLogger.logInfo(log);
.append("\r\n")
.append(message);
this.stackLogger.logInfo(stringBuilder.toString());
} }
@Override @Override
@ -84,8 +73,7 @@ public class ServerLoggerImpl implements ServerLogger {
return; return;
} }
if(sipStack instanceof SIPTransactionStack) { if(sipStack instanceof SIPTransactionStack) {
this.sipStack = (SIPTransactionStack)sipStack; this.stackLogger = CommonLogger.getLogger(sipStack.getClass());
this.stackLogger = CommonLogger.getLogger(SIPTransactionStack.class);
} }
} }
} }

2
src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
View File

@ -45,7 +45,7 @@ public class RecordEndEventListener implements ApplicationListener<RecordEndEven
logger.debug("handler => {}", handler); logger.debug("handler => {}", handler);
if (handler != null){ if (handler != null){
handler.handler(event.getRecordInfo()); handler.handler(event.getRecordInfo());
if (count == sumNum){ if (count >= sumNum){
handlerMap.remove(deviceId + channelId); handlerMap.remove(deviceId + channelId);
} }
} }