From c21d973977a9f1d00d26179de764687ddd0ec56c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 24 四月 2024 14:59:41 +0800
Subject: [PATCH] 修复收到catalog消息是更新导致是否有音频的设置失效的BUG
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java | 204 ++++++++++++++++++++++++--------------------------
1 files changed, 99 insertions(+), 105 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
old mode 100644
new mode 100755
index 480ea73..fc0fda8
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java
@@ -1,25 +1,26 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
+import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.session.RecordDataCatch;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.IMessageHandler;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.ResponseMessageHandler;
import com.genersoft.iot.vmp.utils.DateUtil;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
-import org.dom4j.DocumentException;
+import com.genersoft.iot.vmp.utils.UJson;
+import gov.nist.javax.sip.message.SIPRequest;
import org.dom4j.Element;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
@@ -27,9 +28,9 @@
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.*;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
@@ -39,17 +40,13 @@
@Component
public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
- private Logger logger = LoggerFactory.getLogger(RecordInfoResponseMessageHandler.class);
+ private final Logger logger = LoggerFactory.getLogger(RecordInfoResponseMessageHandler.class);
private final String cmdType = "RecordInfo";
private ConcurrentLinkedQueue<HandlerCatchData> taskQueue = new ConcurrentLinkedQueue<>();
- private boolean taskQueueHandlerRun = false;
@Autowired
private ResponseMessageHandler responseMessageHandler;
-
- @Autowired
- private RecordDataCatch recordDataCatch;
@Autowired
private DeferredResultHolder deferredResultHolder;
@@ -61,6 +58,11 @@
@Autowired
private ThreadPoolTaskExecutor taskExecutor;
+ @Autowired
+ private RedisTemplate<Object, Object> redisTemplate;
+
+ private Long recordInfoTtl = 1800L;
+
@Override
public void afterPropertiesSet() throws Exception {
responseMessageHandler.addHandler(cmdType, this);
@@ -68,101 +70,94 @@
@Override
public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
-
- // 鍥炲200 OK
try {
- responseAck(evt, Response.OK);
- taskQueue.offer(new HandlerCatchData(evt, device, rootElement));
- if (!taskQueueHandlerRun) {
- taskQueueHandlerRun = true;
- taskExecutor.execute(()->{
- while (!taskQueue.isEmpty()) {
- try {
- HandlerCatchData take = taskQueue.poll();
- Element rootElementForCharset = getRootElement(take.getEvt(), take.getDevice().getCharset());
- if (rootElement == null) {
- logger.warn("[ 鍥芥爣褰曞儚 ] content cannot be null");
+ // 鍥炲200 OK
+ responseAck((SIPRequest) evt.getRequest(), Response.OK);
+ }catch (SipException | InvalidArgumentException | ParseException e) {
+ logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍥芥爣褰曞儚: {}", e.getMessage());
+ }
+ taskExecutor.execute(()->{
+ try {
+ String sn = getText(rootElement, "SN");
+ String channelId = getText(rootElement, "DeviceID");
+ RecordInfo recordInfo = new RecordInfo();
+ recordInfo.setChannelId(channelId);
+ recordInfo.setDeviceId(device.getDeviceId());
+ recordInfo.setSn(sn);
+ recordInfo.setName(getText(rootElement, "Name"));
+ String sumNumStr = getText(rootElement, "SumNum");
+ int sumNum = 0;
+ if (!ObjectUtils.isEmpty(sumNumStr)) {
+ sumNum = Integer.parseInt(sumNumStr);
+ }
+ recordInfo.setSumNum(sumNum);
+ Element recordListElement = rootElement.element("RecordList");
+ if (recordListElement == null || sumNum == 0) {
+ logger.info("鏃犲綍鍍忔暟鎹�");
+ recordInfo.setCount(sumNum);
+ eventPublisher.recordEndEventPush(recordInfo);
+ releaseRequest(device.getDeviceId(), sn,recordInfo);
+ } else {
+ Iterator<Element> recordListIterator = recordListElement.elementIterator();
+ if (recordListIterator != null) {
+ List<RecordItem> recordList = new ArrayList<>();
+ // 閬嶅巻DeviceList
+ while (recordListIterator.hasNext()) {
+ Element itemRecord = recordListIterator.next();
+ Element recordElement = itemRecord.element("DeviceID");
+ if (recordElement == null) {
+ logger.info("璁板綍涓虹┖锛屼笅涓�涓�...");
continue;
}
- String sn = getText(rootElementForCharset, "SN");
- String channelId = getText(rootElementForCharset, "DeviceID");
- RecordInfo recordInfo = new RecordInfo();
- recordInfo.setChannelId(channelId);
- recordInfo.setDeviceId(take.getDevice().getDeviceId());
- recordInfo.setSn(sn);
- recordInfo.setName(getText(rootElementForCharset, "Name"));
- String sumNumStr = getText(rootElementForCharset, "SumNum");
- int sumNum = 0;
- if (!StringUtils.isEmpty(sumNumStr)) {
- sumNum = Integer.parseInt(sumNumStr);
- }
- recordInfo.setSumNum(sumNum);
- Element recordListElement = rootElementForCharset.element("RecordList");
- if (recordListElement == null || sumNum == 0) {
- logger.info("鏃犲綍鍍忔暟鎹�");
- eventPublisher.recordEndEventPush(recordInfo);
- recordDataCatch.put(take.getDevice().getDeviceId(), sn, sumNum, new ArrayList<>());
- releaseRequest(take.getDevice().getDeviceId(), sn);
- } else {
- Iterator<Element> recordListIterator = recordListElement.elementIterator();
- if (recordListIterator != null) {
- List<RecordItem> recordList = new ArrayList<>();
- // 閬嶅巻DeviceList
- while (recordListIterator.hasNext()) {
- Element itemRecord = recordListIterator.next();
- Element recordElement = itemRecord.element("DeviceID");
- if (recordElement == null) {
- logger.info("璁板綍涓虹┖锛屼笅涓�涓�...");
- continue;
- }
- RecordItem record = new RecordItem();
- record.setDeviceId(getText(itemRecord, "DeviceID"));
- record.setName(getText(itemRecord, "Name"));
- record.setFilePath(getText(itemRecord, "FilePath"));
- record.setFileSize(getText(itemRecord, "FileSize"));
- record.setAddress(getText(itemRecord, "Address"));
+ RecordItem record = new RecordItem();
+ record.setDeviceId(getText(itemRecord, "DeviceID"));
+ record.setName(getText(itemRecord, "Name"));
+ record.setFilePath(getText(itemRecord, "FilePath"));
+ record.setFileSize(getText(itemRecord, "FileSize"));
+ record.setAddress(getText(itemRecord, "Address"));
- String startTimeStr = getText(itemRecord, "StartTime");
- record.setStartTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTimeStr));
+ String startTimeStr = getText(itemRecord, "StartTime");
+ record.setStartTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTimeStr));
- String endTimeStr = getText(itemRecord, "EndTime");
- record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTimeStr));
+ String endTimeStr = getText(itemRecord, "EndTime");
+ record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTimeStr));
- record.setSecrecy(itemRecord.element("Secrecy") == null ? 0
- : Integer.parseInt(getText(itemRecord, "Secrecy")));
- record.setType(getText(itemRecord, "Type"));
- record.setRecorderId(getText(itemRecord, "RecorderID"));
- recordList.add(record);
- }
- recordInfo.setRecordList(recordList);
- // 鍙戦�佹秷鎭紝濡傛灉鏄笂绾ф煡璇㈡褰曞儚锛屽垯浼氶�氳繃杩欓噷閫氱煡缁欎笂绾�
- eventPublisher.recordEndEventPush(recordInfo);
- int count = recordDataCatch.put(take.getDevice().getDeviceId(), sn, sumNum, recordList);
- logger.info("[鍥芥爣褰曞儚]锛� {}->{}: {}/{}", take.getDevice().getDeviceId(), sn, count, sumNum);
- }
-
- if (recordDataCatch.isComplete(take.getDevice().getDeviceId(), sn)){
- releaseRequest(take.getDevice().getDeviceId(), sn);
- }
- }
- } catch (DocumentException e) {
- throw new RuntimeException(e);
- } finally {
- taskQueueHandlerRun = false;
+ record.setSecrecy(itemRecord.element("Secrecy") == null ? 0
+ : Integer.parseInt(getText(itemRecord, "Secrecy")));
+ record.setType(getText(itemRecord, "Type"));
+ record.setRecorderId(getText(itemRecord, "RecorderID"));
+ recordList.add(record);
}
+ Map<String, String> map = recordList.stream()
+ .filter(record -> record.getDeviceId() != null)
+ .collect(Collectors.toMap(record -> record.getStartTime()+ record.getEndTime(), UJson::writeJson));
+ // 鑾峰彇浠诲姟缁撴灉鏁版嵁
+ String resKey = VideoManagerConstants.REDIS_RECORD_INFO_RES_PRE + channelId + sn;
+ redisTemplate.opsForHash().putAll(resKey, map);
+ redisTemplate.expire(resKey, recordInfoTtl, TimeUnit.SECONDS);
+ String resCountKey = VideoManagerConstants.REDIS_RECORD_INFO_RES_COUNT_PRE + channelId + sn;
+ long incr = redisTemplate.opsForValue().increment(resCountKey, map.size());
+ redisTemplate.expire(resCountKey, recordInfoTtl, TimeUnit.SECONDS);
+ recordInfo.setRecordList(recordList);
+ recordInfo.setCount(Math.toIntExact(incr));
+ eventPublisher.recordEndEventPush(recordInfo);
+ if (incr < sumNum) {
+ return;
+ }
+ // 宸叉帴鏀跺畬鎴�
+ List<RecordItem> resList = redisTemplate.opsForHash().entries(resKey).values().stream().map(e -> UJson.readJson(e.toString(), RecordItem.class)).collect(Collectors.toList());
+ if (resList.size() < sumNum) {
+ return;
+ }
+ recordInfo.setRecordList(resList);
+ releaseRequest(device.getDeviceId(), sn,recordInfo);
}
- });
+ }
+ } catch (Exception e) {
+ logger.error("[鍥芥爣褰曞儚] 鍙戠幇鏈鐞嗙殑寮傚父, \r\n{}", evt.getRequest());
+ logger.error("[鍥芥爣褰曞儚] 寮傚父鍐呭锛� ", e);
}
-
- } catch (SipException e) {
- e.printStackTrace();
- } catch (InvalidArgumentException e) {
- e.printStackTrace();
- } catch (ParseException e) {
- e.printStackTrace();
- }finally {
- taskQueueHandlerRun = false;
- }
+ });
}
@Override
@@ -170,19 +165,18 @@
}
- public void releaseRequest(String deviceId, String sn){
+ public void releaseRequest(String deviceId, String sn,RecordInfo recordInfo){
String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
- WVPResult<RecordInfo> wvpResult = new WVPResult<>();
- wvpResult.setCode(0);
- wvpResult.setMsg("success");
// 瀵规暟鎹繘琛屾帓搴�
- Collections.sort(recordDataCatch.getRecordInfo(deviceId, sn).getRecordList());
- wvpResult.setData(recordDataCatch.getRecordInfo(deviceId, sn));
+ if(recordInfo!=null && recordInfo.getRecordList()!=null) {
+ Collections.sort(recordInfo.getRecordList());
+ }else{
+ recordInfo.setRecordList(new ArrayList<>());
+ }
RequestMessage msg = new RequestMessage();
msg.setKey(key);
- msg.setData(wvpResult);
+ msg.setData(recordInfo);
deferredResultHolder.invokeAllResult(msg);
- recordDataCatch.remove(deviceId, sn);
}
}
--
Gitblit v1.8.0