From 8ee7211ba3f5dd53901e1be73db7c7c2199fe12e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 七月 2022 16:05:23 +0800
Subject: [PATCH] 更新mysql.sql
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java | 196 +++++++++++++++++++++++++++---------------------
1 files changed, 110 insertions(+), 86 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
index 2de8ef1..57e8045 100644
--- 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,57 +1,65 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
-import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
-import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.CheckForAllRecordsThread;
+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.utils.redis.RedisUtil;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.dom4j.DocumentException;
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.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
import javax.sip.SipException;
import javax.sip.message.Response;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.LinkedBlockingQueue;
import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+/**
+ * @author lin
+ */
@Component
public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
private Logger logger = LoggerFactory.getLogger(RecordInfoResponseMessageHandler.class);
- public static volatile List<String> threadNameList = new ArrayList();
private final String cmdType = "RecordInfo";
- private final static String CACHE_RECORDINFO_KEY = "CACHE_RECORDINFO_";
+ private ConcurrentLinkedQueue<HandlerCatchData> taskQueue = new ConcurrentLinkedQueue<>();
+
+ private boolean taskQueueHandlerRun = false;
@Autowired
private ResponseMessageHandler responseMessageHandler;
@Autowired
- private RedisUtil redis;
+ private RecordDataCatch recordDataCatch;
@Autowired
private DeferredResultHolder deferredResultHolder;
@Autowired
private EventPublisher eventPublisher;
+
+ @Qualifier("taskExecutor")
+ @Autowired
+ private ThreadPoolTaskExecutor taskExecutor;
@Override
public void afterPropertiesSet() throws Exception {
@@ -64,88 +72,88 @@
// 鍥炲200 OK
try {
responseAck(evt, Response.OK);
+ taskQueue.offer(new HandlerCatchData(evt, device, rootElement));
+ if (!taskQueueHandlerRun) {
+ taskQueueHandlerRun = true;
+ taskExecutor.execute(()->{
+ try {
+ while (!taskQueue.isEmpty()) {
+ HandlerCatchData take = taskQueue.poll();
+ Element rootElementForCharset = getRootElement(take.getEvt(), take.getDevice().getCharset());
+ 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"));
- rootElement = getRootElement(evt, device.getCharset());
- String uuid = UUID.randomUUID().toString().replace("-", "");
- RecordInfo recordInfo = new RecordInfo();
- String sn = getText(rootElement, "SN");
- String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + device.getDeviceId() + sn;
- recordInfo.setDeviceId(device.getDeviceId());
- recordInfo.setSn(sn);
- recordInfo.setName(getText(rootElement, "Name"));
- if (getText(rootElement, "SumNum") == null || getText(rootElement, "SumNum") == "") {
- recordInfo.setSumNum(0);
- } else {
- recordInfo.setSumNum(Integer.parseInt(getText(rootElement, "SumNum")));
- }
- Element recordListElement = rootElement.element("RecordList");
- if (recordListElement == null || recordInfo.getSumNum() == 0) {
- logger.info("鏃犲綍鍍忔暟鎹�");
- eventPublisher.recordEndEventPush(recordInfo);
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(recordInfo);
- deferredResultHolder.invokeAllResult(msg);
- } else {
- Iterator<Element> recordListIterator = recordListElement.elementIterator();
- List<RecordItem> recordList = new ArrayList<RecordItem>();
- if (recordListIterator != null) {
- RecordItem record = new RecordItem();
- logger.info("澶勭悊褰曞儚鍒楄〃鏁版嵁...");
- // 閬嶅巻DeviceList
- while (recordListIterator.hasNext()) {
- Element itemRecord = recordListIterator.next();
- Element recordElement = itemRecord.element("DeviceID");
- if (recordElement == null) {
- logger.info("璁板綍涓虹┖锛屼笅涓�涓�...");
- continue;
+ 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));
+
+ 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);
+ }
+ }
}
- 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"));
- record.setStartTime(
- DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "StartTime")));
- record.setEndTime(
- DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "EndTime")));
- 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);
+ taskQueueHandlerRun = false;
+ }catch (DocumentException e) {
+ throw new RuntimeException(e);
}
- recordInfo.setRecordList(recordList);
- }
- eventPublisher.recordEndEventPush(recordInfo);
- // 鏀圭敤鍗曠嫭绾跨▼缁熻宸茶幏鍙栧綍鍍忔枃浠舵暟閲忥紝閬垮厤澶氬寘骞惰鍒嗗埆缁熻涓嶅畬鏁寸殑闂
- String cacheKey = CACHE_RECORDINFO_KEY + device.getDeviceId() + sn;
- redis.set(cacheKey + "_" + uuid, recordList, 90);
- if (!threadNameList.contains(cacheKey)) {
- threadNameList.add(cacheKey);
- CheckForAllRecordsThread chk = new CheckForAllRecordsThread(cacheKey, recordInfo);
- chk.setName(cacheKey);
- chk.setDeferredResultHolder(deferredResultHolder);
- chk.setRedis(redis);
- chk.setLogger(logger);
- chk.start();
- if (logger.isDebugEnabled()) {
- logger.debug("Start Thread " + cacheKey + ".");
- }
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("Thread " + cacheKey + " already started.");
- }
- }
+ });
}
+
} catch (SipException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
e.printStackTrace();
} catch (ParseException e) {
- e.printStackTrace();
- } catch (DocumentException e) {
e.printStackTrace();
}
}
@@ -154,4 +162,20 @@
public void handForPlatform(RequestEvent evt, ParentPlatform parentPlatform, Element element) {
}
+
+ public void releaseRequest(String deviceId, String sn){
+ 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));
+
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setData(wvpResult);
+ deferredResultHolder.invokeAllResult(msg);
+ recordDataCatch.remove(deviceId, sn);
+ }
}
--
Gitblit v1.8.0