From 4c66f6b29eda2d459aed86f7a138438191de7e47 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 17:35:32 +0800
Subject: [PATCH] 优化消息处理中存在可能异常的处理流程

---
 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java |  168 +++++++++++++++++++++++++++----------------------------
 1 files changed, 82 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 50a4ed8..3c75536 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
@@ -69,95 +69,91 @@
 
     @Override
     public void handForDevice(RequestEvent evt, Device device, Element rootElement) {
-
-        // 鍥炲200 OK
         try {
+            // 鍥炲200 OK
             responseAck(getServerTransaction(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, {}", evt.getRequest());
-                                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 (!ObjectUtils.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"));
-
-                                        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);
-                                }
-                            }
-                        } catch (DocumentException e) {
-                            logger.error("xml瑙f瀽寮傚父锛� ", e);
-                        }
-                    }
-                    taskQueueHandlerRun = false;
-                });
-            }
-
-        } catch (SipException | InvalidArgumentException | ParseException e) {
+        }catch (SipException | InvalidArgumentException | ParseException e) {
             logger.error("[鍛戒护鍙戦�佸け璐 鍥芥爣绾ц仈 鍥芥爣褰曞儚: {}", e.getMessage());
-        } finally {
-            taskQueueHandlerRun = false;
+        }
+        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, {}", evt.getRequest());
+                            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 (!ObjectUtils.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"));
+
+                                    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);
+                            }
+                        }
+                    } catch (DocumentException e) {
+                        logger.error("xml瑙f瀽寮傚父锛� ", e);
+                    }
+                }
+                taskQueueHandlerRun = false;
+            });
         }
     }
 

--
Gitblit v1.8.0