Merge remote-tracking branch 'origin/dev' into dev

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/bean/RecordInfo.java

@@ -10,7 +10,7 @@ import java.util.List;
  * @author: dgs
  * @date:   2020年5月8日 下午2:05:56
  */
-public class RecordInfo {
+public class RecordInfos {
 
 	private String deviceId;
 

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java

@@ -1,6 +1,6 @@
 package com.zd.alg.iot.vmp.gb28181.transmit.callback;
 
-import com.zd.alg.iot.vmp.gb28181.bean.RecordInfo;
+import com.zd.alg.iot.vmp.gb28181.bean.RecordInfos;
 import com.zd.alg.iot.vmp.gb28181.bean.RecordItem;
 import com.zd.alg.iot.vmp.gb28181.transmit.request.impl.MessageRequestProcessor;
 import com.zd.alg.iot.vmp.utils.redis.RedisUtil;
@@ -16,7 +16,7 @@ public class CheckForAllRecordsThread extends Thread {
 
     private String key;
 
-    private RecordInfo recordInfo;
+    private RecordInfos recordInfos;
 
     private RedisUtil redis;
 
@@ -24,9 +24,9 @@ public class CheckForAllRecordsThread extends Thread {
 
     private DeferredResultHolder deferredResultHolder;
 
-    public CheckForAllRecordsThread(String key, RecordInfo recordInfo) {
+    public CheckForAllRecordsThread(String key, RecordInfos recordInfos) {
         this.key = key;
-        this.recordInfo = recordInfo;
+        this.recordInfos = recordInfos;
     }
 
     public void run() {
@@ -39,11 +39,11 @@ public class CheckForAllRecordsThread extends Thread {
             for (int i = 0; i < cacheKeys.size(); i++) {
                 totalRecordList.addAll((List<RecordItem>) redis.get(cacheKeys.get(i).toString()));
             }
-            if (totalRecordList.size() < this.recordInfo.getSumNum()) {
-                logger.info("已获取" + totalRecordList.size() + "项录像数据，共" + this.recordInfo.getSumNum() + "项");
+            if (totalRecordList.size() < this.recordInfos.getSumNum()) {
+                logger.info("已获取" + totalRecordList.size() + "项录像数据，共" + this.recordInfos.getSumNum() + "项");
             } else {
-                logger.info("录像数据已全部获取，共 {} 项", this.recordInfo.getSumNum());
-                this.recordInfo.setRecordList(totalRecordList);
+                logger.info("录像数据已全部获取，共 {} 项", this.recordInfos.getSumNum());
+                this.recordInfos.setRecordList(totalRecordList);
                 for (int i = 0; i < cacheKeys.size(); i++) {
                     redis.del(cacheKeys.get(i).toString());
                 }
@@ -51,12 +51,12 @@ public class CheckForAllRecordsThread extends Thread {
             }
         }
         // 自然顺序排序, 元素进行升序排列
-        this.recordInfo.getRecordList().sort(Comparator.naturalOrder());
+        this.recordInfos.getRecordList().sort(Comparator.naturalOrder());
         RequestMessage msg = new RequestMessage();
-        String deviceId = recordInfo.getDeviceId();
+        String deviceId = recordInfos.getDeviceId();
         msg.setDeviceId(deviceId);
         msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
-        msg.setData(recordInfo);
+        msg.setData(recordInfos);
         deferredResultHolder.invokeResult(msg);
         logger.info("处理完成，返回结果");
         MessageRequestProcessor.threadNameList.remove(cacheKey);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java

@@ -823,7 +823,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 			// 回复200 OK
 			responseAck(evt);
 			String uuid = UUID.randomUUID().toString().replace("-", "");
-			RecordInfo recordInfo = new RecordInfo();
+			RecordInfos recordInfos = new RecordInfos();
 			Element rootElement = getRootElement(evt);
 			Element deviceIdElement = rootElement.element("DeviceID");
 			String deviceId = deviceIdElement.getText().toString();
@@ -831,21 +831,21 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 			if (device != null ) {
 				rootElement = getRootElement(evt, device.getCharset());
 			}
-			recordInfo.setDeviceId(deviceId);
-			recordInfo.setName(XmlUtil.getText(rootElement, "Name"));
+			recordInfos.setDeviceId(deviceId);
+			recordInfos.setName(XmlUtil.getText(rootElement, "Name"));
 			if (XmlUtil.getText(rootElement, "SumNum")== null || XmlUtil.getText(rootElement, "SumNum") =="") {
-				recordInfo.setSumNum(0);
+				recordInfos.setSumNum(0);
 			} else {
-				recordInfo.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement, "SumNum")));
+				recordInfos.setSumNum(Integer.parseInt(XmlUtil.getText(rootElement, "SumNum")));
 			}
 			String sn = XmlUtil.getText(rootElement, "SN");
 			Element recordListElement = rootElement.element("RecordList");
-			if (recordListElement == null || recordInfo.getSumNum() == 0) {
+			if (recordListElement == null || recordInfos.getSumNum() == 0) {
 				logger.info("无录像数据");
 				RequestMessage msg = new RequestMessage();
 				msg.setDeviceId(deviceId);
 				msg.setType(DeferredResultHolder.CALLBACK_CMD_RECORDINFO);
-				msg.setData(recordInfo);
+				msg.setData(recordInfos);
 				deferredResultHolder.invokeResult(msg);
 			} else {
 				Iterator<Element> recordListIterator = recordListElement.elementIterator();
@@ -876,7 +876,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 						record.setRecorderId(XmlUtil.getText(itemRecord, "RecorderID"));
 						recordList.add(record);
 					}
-					recordInfo.setRecordList(recordList);
+					recordInfos.setRecordList(recordList);
 				}
 
 				// 改用单独线程统计已获取录像文件数量，避免多包并行分别统计不完整的问题
@@ -884,7 +884,7 @@ public class MessageRequestProcessor extends SIPRequestAbstractProcessor {
 				redis.set(cacheKey + "_" + uuid, recordList, 90);
 				if (!threadNameList.contains(cacheKey)) {
 					threadNameList.add(cacheKey);
-					CheckForAllRecordsThread chk = new CheckForAllRecordsThread(cacheKey, recordInfo);
+					CheckForAllRecordsThread chk = new CheckForAllRecordsThread(cacheKey, recordInfos);
 					chk.setName(cacheKey);
 					chk.setDeferredResultHolder(deferredResultHolder);
 					chk.setRedis(redis);

zd-modules/zd-algorithm/src/main/java/com/zd/alg/iot/vmp/vmanager/gb28181/record/GBRecordController.java

@@ -1,7 +1,7 @@
 package com.zd.alg.iot.vmp.vmanager.gb28181.record;
 
 import com.zd.alg.iot.vmp.gb28181.bean.Device;
-import com.zd.alg.iot.vmp.gb28181.bean.RecordInfo;
+import com.zd.alg.iot.vmp.gb28181.bean.RecordInfos;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
 import com.zd.alg.iot.vmp.gb28181.transmit.callback.RequestMessage;
 import com.zd.alg.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
@@ -42,7 +42,7 @@ public class GBRecordController {
 			@ApiImplicitParam(name = "endTime", value = "结束时间", dataTypeClass = String.class),
 	})
 	@GetMapping("/query/{deviceId}/{channelId}")
-	public DeferredResult<ResponseEntity<RecordInfo>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
+	public DeferredResult<ResponseEntity<RecordInfos>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
 
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("录像信息查询 API调用，deviceId：%s ，startTime：%s， startTime：%s",deviceId, startTime, endTime));
@@ -51,7 +51,7 @@ public class GBRecordController {
 		Device device = storager.queryVideoDevice(deviceId);
 		cmder.recordInfoQuery(device, channelId, startTime, endTime);
 		// 指定超时时间 1分钟30秒
-		DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<ResponseEntity<RecordInfo>>(90*1000L);
+		DeferredResult<ResponseEntity<RecordInfos>> result = new DeferredResult<ResponseEntity<RecordInfos>>(90*1000L);
 		// 录像查询以channelId作为deviceId查询
 		resultHolder.put(DeferredResultHolder.CALLBACK_CMD_RECORDINFO+channelId, result);
 		result.onTimeout(()->{