From a623e7a387bde6d41df3c77dc25e87a4b94615ec Mon Sep 17 00:00:00 2001
From: zxb <919411476@qq.com>
Date: Mon, 21 Aug 2023 16:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=8B=89=E5=8F=96=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/gb28181/conf/ServerLoggerImpl.java    | 28 ++++++-------------
 .../event/record/RecordEndEventListener.java  | 16 ++++++++---
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java
index c7b1f6e6..7a24ee3c 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/conf/ServerLoggerImpl.java
@@ -9,12 +9,11 @@ import gov.nist.javax.sip.stack.SIPTransactionStack;
 import javax.sip.SipStack;
 import java.util.Properties;
 
+@SuppressWarnings("unused")
 public class ServerLoggerImpl implements ServerLogger {
 
     private boolean showLog = true;
 
-    private SIPTransactionStack sipStack;
-
     protected StackLogger stackLogger;
 
     @Override
@@ -27,12 +26,8 @@ public class ServerLoggerImpl implements ServerLogger {
         if (!showLog) {
             return;
         }
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(sender? "发送：目标--->" + from:"接收：来自--->" + to)
-                .append("\r\n")
-                        .append(message);
-        this.stackLogger.logInfo(stringBuilder.toString());
-
+        String log = (sender ? "发送: 目标 => " + to : "接收: 来自 => " + from) + "\r\n" + message;
+        this.stackLogger.logInfo(log);
     }
 
     @Override
@@ -40,11 +35,8 @@ public class ServerLoggerImpl implements ServerLogger {
         if (!showLog) {
             return;
         }
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(sender? "发送： 目标->" + from :"接收：来自->" + to)
-                .append("\r\n")
-                .append(message);
-        this.stackLogger.logInfo(stringBuilder.toString());
+        String log = (sender ? "发送: 目标 => " + to : "接收: 来自 => " + from) + "\r\n" + message;
+        this.stackLogger.logInfo(log);
     }
 
     @Override
@@ -52,11 +44,8 @@ public class ServerLoggerImpl implements ServerLogger {
         if (!showLog) {
             return;
         }
-        StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append(sender? "发送： 目标->" + from :"接收：来自->" + to)
-                .append("\r\n")
-                .append(message);
-        this.stackLogger.logInfo(stringBuilder.toString());
+        String log = (sender ? "发送: 目标 => " + to : "接收: 来自 => " + from) + "\r\n" + message;
+        this.stackLogger.logInfo(log);
     }
 
     @Override
@@ -84,8 +73,7 @@ public class ServerLoggerImpl implements ServerLogger {
             return;
         }
         if(sipStack instanceof SIPTransactionStack) {
-            this.sipStack = (SIPTransactionStack)sipStack;
-            this.stackLogger = CommonLogger.getLogger(SIPTransactionStack.class);
+            this.stackLogger = CommonLogger.getLogger(sipStack.getClass());
         }
     }
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
index cb468230..5dc80dec 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/record/RecordEndEventListener.java
@@ -6,6 +6,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -22,7 +24,7 @@ public class RecordEndEventListener implements ApplicationListener<RecordEndEven
 
     private final static Logger logger = LoggerFactory.getLogger(RecordEndEventListener.class);
 
-    private Map<String, RecordEndEventHandler> handlerMap = new ConcurrentHashMap<>();
+    private final static Map<String, RecordEndEventHandler> handlerMap = new ConcurrentHashMap<>();
     public interface RecordEndEventHandler{
         void  handler(RecordInfo recordInfo);
     }
@@ -33,13 +35,17 @@ public class RecordEndEventListener implements ApplicationListener<RecordEndEven
         String channelId = event.getRecordInfo().getChannelId();
         int count = event.getRecordInfo().getCount();
         int sumNum = event.getRecordInfo().getSumNum();
-        logger.info("录像查询完成事件触发，deviceId：{}, channelId: {}, 录像数量{}/{}条", event.getRecordInfo().getDeviceId(),
+        logger.info("录像查询完成事件触发，deviceId：{}, channelId: {}, 录像数量{}/{}条",
+                event.getRecordInfo().getDeviceId(),
                 event.getRecordInfo().getChannelId(), count,sumNum);
+        logger.debug("handlerMap.size => {}", handlerMap.size());
         if (handlerMap.size() > 0) {
+            logger.debug("handlerMap.keys => {}", handlerMap.keySet());
             RecordEndEventHandler handler = handlerMap.get(deviceId + channelId);
-            if (handler !=null){
+            logger.debug("handler => {}", handler);
+            if (handler != null){
                 handler.handler(event.getRecordInfo());
-                if (count ==sumNum){
+                if (count >= sumNum){
                     handlerMap.remove(deviceId + channelId);
                 }
             }
@@ -53,6 +59,7 @@ public class RecordEndEventListener implements ApplicationListener<RecordEndEven
      * @param recordEndEventHandler
      */
     public void addEndEventHandler(String device, String channelId, RecordEndEventHandler recordEndEventHandler) {
+        logger.debug("RecordEndEventListener addEndEventHandler => deviceId: {}, channelId: {}", device,channelId);
         handlerMap.put(device + channelId, recordEndEventHandler);
     }
     /**
@@ -61,6 +68,7 @@ public class RecordEndEventListener implements ApplicationListener<RecordEndEven
      * @param channelId
      */
     public void delEndEventHandler(String device, String channelId) {
+        logger.debug("RecordEndEventListener delEndEventHandler => deviceId: {}, channelId: {}", device,channelId);
         handlerMap.remove(device + channelId);
     }