From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/session/RecordDataCatch.java | 91 +++++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 56 ++-
src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java | 5
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java | 1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/RecordInfoResponseMessageHandler.java | 99 ++++----
pom.xml | 7
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java | 2
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java | 8
web_src/src/components/dialog/devicePlayer.vue | 22 +
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java | 10
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java | 18
src/main/resources/application-dev.yml | 1
src/main/resources/application-docker.yml | 2
src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java | 19
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java | 2
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 31 --
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java | 25 +-
src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java | 27 -
src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java | 28 +-
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java | 8
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java | 59 ++--
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java | 5
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java | 2
src/main/resources/all-application.yml | 2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 12
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java | 14
README.md | 1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 18
/dev/null | 76 ------
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java | 8
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java | 4
web_src/src/components/channelList.vue | 2
web_src/src/components/dialog/recordDownload.vue | 1
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java | 33 ++
34 files changed, 368 insertions(+), 331 deletions(-)
diff --git a/README.md b/README.md
index f9ef44a..7ba443f 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,6 @@
- [X] 娣诲姞RTMP瑙嗛
- [X] 浜戠褰曞儚锛堥渶瑕侀儴缃插崟鐙湇鍔￠厤鍚堜娇鐢級
- [X] 澶氭祦濯掍綋鑺傜偣锛岃嚜鍔ㄩ�夋嫨璐熻浇鏈�浣庣殑鑺傜偣浣跨敤銆�
-- [X] 鏀寔浣跨敤mysql浣滀负鏁版嵁搴擄紝榛樿sqlite3,寮�绠卞嵆鐢ㄣ��
- [X] WEB绔敮鎸佹挱鏀綡264涓嶩265锛岄煶棰戞敮鎸丟.711A/G.711U/AAC,瑕嗙洊鍥芥爣甯哥敤缂栫爜鏍煎紡銆�
[//]: # (# docker蹇�熶綋楠�)
diff --git a/pom.xml b/pom.xml
index eade1f0..1546e39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,13 +101,6 @@
<version>8.0.22</version>
</dependency>
- <!-- 娣诲姞sqlite-jdbc鏁版嵁搴撻┍鍔� -->
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.32.3.2</version>
- </dependency>
-
<!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
index 2812f92..3b021de 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/DynamicTask.java
@@ -1,7 +1,6 @@
package com.genersoft.iot.vmp.conf;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,25 +8,27 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
import org.springframework.stereotype.Component;
-import java.util.Date;
+import java.time.Instant;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
/**
* 鍔ㄦ�佸畾鏃朵换鍔�
+ * @author lin
*/
@Component
public class DynamicTask {
- private Logger logger = LoggerFactory.getLogger(DynamicTask.class);
+ private final Logger logger = LoggerFactory.getLogger(DynamicTask.class);
@Autowired
private ThreadPoolTaskScheduler threadPoolTaskScheduler;
- private Map<String, ScheduledFuture<?>> futureMap = new ConcurrentHashMap<>();
- private Map<String, Runnable> runnableMap = new ConcurrentHashMap<>();
+ private final Map<String, ScheduledFuture<?>> futureMap = new ConcurrentHashMap<>();
+ private final Map<String, Runnable> runnableMap = new ConcurrentHashMap<>();
@Bean
public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
@@ -47,7 +48,7 @@
* @return
*/
public void startCron(String key, Runnable task, int cycleForCatalog) {
- ScheduledFuture future = futureMap.get(key);
+ ScheduledFuture<?> future = futureMap.get(key);
if (future != null) {
if (future.isCancelled()) {
logger.debug("浠诲姟銆恵}銆戝凡瀛樺湪浣嗘槸鍏抽棴鐘舵�侊紒锛侊紒", key);
@@ -76,7 +77,9 @@
*/
public void startDelay(String key, Runnable task, int delay) {
stop(key);
- Date starTime = new Date(System.currentTimeMillis() + delay);
+
+ // 鑾峰彇鎵ц鐨勬椂鍒�
+ Instant startInstant = Instant.now().plusMillis(TimeUnit.MILLISECONDS.toMillis(delay));
ScheduledFuture future = futureMap.get(key);
if (future != null) {
@@ -88,7 +91,7 @@
}
}
// scheduleWithFixedDelay 蹇呴』绛夊緟涓婁竴涓换鍔＄粨鏉熸墠寮�濮嬭鏃秔eriod锛� cycleForCatalog琛ㄧず鎵ц鐨勯棿闅�
- future = threadPoolTaskScheduler.schedule(task, starTime);
+ future = threadPoolTaskScheduler.schedule(task, startInstant);
if (future != null){
futureMap.put(key, future);
runnableMap.put(key, task);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
index 2b93d70..a3428b1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
@@ -81,11 +81,11 @@
tcpSipProvider.setDialogErrorsAutomaticallyHandled();
tcpSipProvider.addSipListener(sipProcessorObserver);
// tcpSipProvider.setAutomaticDialogSupportEnabled(false);
- logger.info("Sip Server TCP 鍚姩鎴愬姛 port {" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "}");
+ logger.info("[Sip Server] TCP 鍚姩鎴愬姛 {}:{}", sipConfig.getMonitorIp(), sipConfig.getPort());
} catch (TransportNotSupportedException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
- logger.error("鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ TCP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
+ logger.error("[Sip Server] 鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ TCP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
, sipConfig.getMonitorIp(), sipConfig.getPort());
} catch (TooManyListenersException e) {
e.printStackTrace();
@@ -108,14 +108,14 @@
} catch (TransportNotSupportedException e) {
e.printStackTrace();
} catch (InvalidArgumentException e) {
- logger.error("鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ UDP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
+ logger.error("[Sip Server] 鏃犳硶浣跨敤 [ {}:{} ]浣滀负SIP[ UDP ]鏈嶅姟锛屽彲鎺掓煡: 1. sip.monitor-ip 鏄惁涓烘湰鏈虹綉鍗P; 2. sip.port 鏄惁宸茶鍗犵敤"
, sipConfig.getMonitorIp(), sipConfig.getPort());
} catch (TooManyListenersException e) {
e.printStackTrace();
} catch (ObjectInUseException e) {
e.printStackTrace();
}
- logger.info("Sip Server UDP 鍚姩鎴愬姛 port [" + sipConfig.getMonitorIp() + ":" + sipConfig.getPort() + "]");
+ logger.info("[Sip Server] UDP 鍚姩鎴愬姛 {}:{}", sipConfig.getMonitorIp(), sipConfig.getPort());
return udpSipProvider;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
index f6284f5..a0e16bf 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
@@ -27,8 +27,7 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.text.DecimalFormat;
-import java.util.Date;
+import java.time.Instant;
import java.util.Random;
import javax.sip.address.URI;
@@ -90,17 +89,12 @@
* @return a generated nonce.
*/
private String generateNonce() {
- // Get the time of day and run MD5 over it.
- Date date = new Date();
- long time = date.getTime();
+ long time = Instant.now().toEpochMilli();
Random rand = new Random();
long pad = rand.nextLong();
- // String nonceString = (new Long(time)).toString()
- // + (new Long(pad)).toString();
String nonceString = Long.valueOf(time).toString()
+ Long.valueOf(pad).toString();
byte mdbytes[] = messageDigest.digest(nonceString.getBytes());
- // Convert the mdbytes array into a hex string.
return toHexString(mdbytes);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
index 338f8ad..8a96d35 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/CatalogData.java
@@ -1,13 +1,13 @@
package com.genersoft.iot.vmp.gb28181.bean;
-import java.util.Date;
+import java.time.Instant;
import java.util.List;
public class CatalogData {
private int sn; // 鍛戒护搴忓垪鍙�
private int total;
private List<DeviceChannel> channelList;
- private Date lastTime;
+ private Instant lastTime;
private Device device;
private String errorMsg;
@@ -41,11 +41,11 @@
this.channelList = channelList;
}
- public Date getLastTime() {
+ public Instant getLastTime() {
return lastTime;
}
- public void setLastTime(Date lastTime) {
+ public void setLastTime(Instant lastTime) {
this.lastTime = lastTime;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
index 24fc221..2121db7 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
@@ -1,8 +1,6 @@
package com.genersoft.iot.vmp.gb28181.bean;
-
-//import gov.nist.javax.sip.header.SIPDate;
-
+import java.time.Instant;
import java.util.List;
/**
@@ -21,6 +19,8 @@
private String name;
private int sumNum;
+
+ private Instant lastTime;
private List<RecordItem> recordList;
@@ -71,4 +71,12 @@
public void setSn(String sn) {
this.sn = sn;
}
+
+ public Instant getLastTime() {
+ return lastTime;
+ }
+
+ public void setLastTime(Instant lastTime) {
+ this.lastTime = lastTime;
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
index 3349cdc..a47147a 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordItem.java
@@ -5,7 +5,8 @@
import org.jetbrains.annotations.NotNull;
import java.text.ParseException;
-import java.util.Date;
+import java.time.Instant;
+import java.time.temporal.TemporalAccessor;
/**
* @description:璁惧褰曞儚bean
@@ -116,17 +117,17 @@
@Override
public int compareTo(@NotNull RecordItem recordItem) {
- try {
- Date startTime_now = DateUtil.format.parse(startTime);
- Date startTime_param = DateUtil.format.parse(recordItem.getStartTime());
- if (startTime_param.compareTo(startTime_now) > 0) {
- return -1;
- }else {
- return 1;
- }
- } catch (ParseException e) {
- e.printStackTrace();
+ TemporalAccessor startTimeNow = DateUtil.formatter.parse(startTime);
+ TemporalAccessor startTimeParam = DateUtil.formatter.parse(recordItem.getStartTime());
+ Instant startTimeParamInstant = Instant.from(startTimeParam);
+ Instant startTimeNowInstant = Instant.from(startTimeNow);
+ if (startTimeNowInstant.equals(startTimeParamInstant)) {
+ return 0;
+ }else if (Instant.from(startTimeParam).isAfter(Instant.from(startTimeNow)) ) {
+ return -1;
+ }else {
+ return 1;
}
- return 0;
+
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
index 2736be2..f191c00 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/SubscribeHolder.java
@@ -66,7 +66,6 @@
dynamicTask.stop(taskOverdueKey);
// 娣诲姞浠诲姟澶勭悊璁㈤槄杩囨湡
dynamicTask.startDelay(taskOverdueKey, () -> {
- System.out.println("璁㈤槄杩囨湡");
removeMobilePositionSubscribe(subscribeInfo.getId());
},
subscribeInfo.getExpires() * 1000);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
index bc775e4..3d817c3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/SipSubscribe.java
@@ -9,11 +9,14 @@
import javax.sip.*;
import javax.sip.header.CallIdHeader;
import javax.sip.message.Response;
-import java.util.Calendar;
-import java.util.Date;
+import java.time.Instant;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+/**
+ * @author lin
+ */
@Component
public class SipSubscribe {
@@ -23,28 +26,25 @@
private Map<String, SipSubscribe.Event> okSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> okTimeSubscribes = new ConcurrentHashMap<>();
- private Map<String, Date> errorTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Instant> okTimeSubscribes = new ConcurrentHashMap<>();
+ private Map<String, Instant> errorTimeSubscribes = new ConcurrentHashMap<>();
// @Scheduled(cron="*/5 * * * * ?") //姣忎簲绉掓墽琛屼竴娆�
-// @Scheduled(fixedRate= 100 * 60 * 60 )
+ // @Scheduled(fixedRate= 100 * 60 * 60 )
@Scheduled(cron="0 0/5 * * * ?") //姣�5鍒嗛挓鎵ц涓�娆�
public void execute(){
logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨凷IP璁㈤槄淇℃伅");
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.set(Calendar.MINUTE, calendar.get(Calendar.MINUTE) - 5);
+
+ Instant instant = Instant.now().minusMillis(TimeUnit.MINUTES.toMillis(5));
for (String key : okTimeSubscribes.keySet()) {
- if (okTimeSubscribes.get(key).before(calendar.getTime())){
-// logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ if (okTimeSubscribes.get(key).isBefore(instant)){
okSubscribes.remove(key);
okTimeSubscribes.remove(key);
}
}
for (String key : errorTimeSubscribes.keySet()) {
- if (errorTimeSubscribes.get(key).before(calendar.getTime())){
-// logger.info("[瀹氭椂浠诲姟] 娓呯悊杩囨湡鐨勮闃呬俊鎭細 {}", key);
+ if (errorTimeSubscribes.get(key).isBefore(instant)){
errorSubscribes.remove(key);
errorTimeSubscribes.remove(key);
}
@@ -117,12 +117,12 @@
public void addErrorSubscribe(String key, SipSubscribe.Event event) {
errorSubscribes.put(key, event);
- errorTimeSubscribes.put(key, new Date());
+ errorTimeSubscribes.put(key, Instant.now());
}
public void addOkSubscribe(String key, SipSubscribe.Event event) {
okSubscribes.put(key, event);
- okTimeSubscribes.put(key, new Date());
+ okTimeSubscribes.put(key, Instant.now());
}
public SipSubscribe.Event getErrorSubscribe(String key) {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
index 75b9f59..7ed3c11 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/CatalogDataCatch.java
@@ -4,24 +4,20 @@
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.time.Instant;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
@Component
public class CatalogDataCatch {
public static Map<String, CatalogData> data = new ConcurrentHashMap<>();
-
- @Autowired
- private DeferredResultHolder deferredResultHolder;
@Autowired
private IVideoManagerStorage storager;
@@ -34,7 +30,7 @@
catalogData.setDevice(device);
catalogData.setSn(sn);
catalogData.setStatus(CatalogData.CatalogDataStatus.ready);
- catalogData.setLastTime(new Date(System.currentTimeMillis()));
+ catalogData.setLastTime(Instant.now());
data.put(device.getDeviceId(), catalogData);
}
}
@@ -48,7 +44,7 @@
catalogData.setDevice(device);
catalogData.setChannelList(Collections.synchronizedList(new ArrayList<>()));
catalogData.setStatus(CatalogData.CatalogDataStatus.runIng);
- catalogData.setLastTime(new Date(System.currentTimeMillis()));
+ catalogData.setLastTime(Instant.now());
data.put(deviceId, catalogData);
}else {
// 鍚屼竴涓澶囩殑閫氶亾鍚屾璇锋眰鍙�冭檻涓�涓紝鍏朵粬鐨勭洿鎺ュ拷鐣�
@@ -59,7 +55,7 @@
catalogData.setDevice(device);
catalogData.setStatus(CatalogData.CatalogDataStatus.runIng);
catalogData.getChannelList().addAll(deviceChannelList);
- catalogData.setLastTime(new Date(System.currentTimeMillis()));
+ catalogData.setLastTime(Instant.now());
}
}
@@ -102,16 +98,13 @@
@Scheduled(fixedRate = 5 * 1000) //姣�5绉掓墽琛屼竴娆�, 鍙戠幇鏁版嵁5绉掓湭鏇存柊鍒欑Щ闄ゆ暟鎹苟璁や负鏁版嵁鎺ユ敹瓒呮椂
private void timerTask(){
Set<String> keys = data.keySet();
- Calendar calendarBefore5S = Calendar.getInstance();
- calendarBefore5S.setTime(new Date());
- calendarBefore5S.set(Calendar.SECOND, calendarBefore5S.get(Calendar.SECOND) - 5);
- Calendar calendarBefore30S = Calendar.getInstance();
- calendarBefore30S.setTime(new Date());
- calendarBefore30S.set(Calendar.SECOND, calendarBefore30S.get(Calendar.SECOND) - 30);
+ Instant instantBefore5S = Instant.now().minusMillis(TimeUnit.SECONDS.toMillis(5));
+ Instant instantBefore30S = Instant.now().minusMillis(TimeUnit.SECONDS.toMillis(30));
+
for (String deviceId : keys) {
CatalogData catalogData = data.get(deviceId);
- if ( catalogData.getLastTime().before(calendarBefore5S.getTime())) { // 瓒呰繃浜旂鏀朵笉鍒版秷鎭换鍔¤秴鏃讹紝 鍙洿鏂拌繖涓�閮ㄥ垎鏁版嵁
+ if ( catalogData.getLastTime().isBefore(instantBefore5S)) { // 瓒呰繃浜旂鏀朵笉鍒版秷鎭换鍔¤秴鏃讹紝 鍙洿鏂拌繖涓�閮ㄥ垎鏁版嵁
if (catalogData.getStatus().equals(CatalogData.CatalogDataStatus.runIng)) {
storager.resetChannels(catalogData.getDevice().getDeviceId(), catalogData.getChannelList());
if (catalogData.getTotal() != catalogData.getChannelList().size()) {
@@ -124,7 +117,7 @@
}
catalogData.setStatus(CatalogData.CatalogDataStatus.end);
}
- if (catalogData.getStatus().equals(CatalogData.CatalogDataStatus.end) && catalogData.getLastTime().before(calendarBefore30S.getTime())) { // 瓒呰繃涓夊崄绉掞紝濡傛灉鏍囪涓篹nd鍒欏垹闄�
+ if (catalogData.getStatus().equals(CatalogData.CatalogDataStatus.end) && catalogData.getLastTime().isBefore(instantBefore30S)) { // 瓒呰繃涓夊崄绉掞紝濡傛灉鏍囪涓篹nd鍒欏垹闄�
data.remove(deviceId);
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/RecordDataCatch.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/RecordDataCatch.java
new file mode 100644
index 0000000..dd5b8df
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/RecordDataCatch.java
@@ -0,0 +1,91 @@
+package com.genersoft.iot.vmp.gb28181.session;
+
+import com.genersoft.iot.vmp.gb28181.bean.*;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author lin
+ */
+@Component
+public class RecordDataCatch {
+
+ public static Map<String, RecordInfo> data = new ConcurrentHashMap<>();
+
+ @Autowired
+ private DeferredResultHolder deferredResultHolder;
+
+
+ public int put(String deviceId, String sn, int sumNum, List<RecordItem> recordItems) {
+ String key = deviceId + sn;
+ RecordInfo recordInfo = data.get(key);
+ if (recordInfo == null) {
+ recordInfo = new RecordInfo();
+ recordInfo.setDeviceId(deviceId);
+ recordInfo.setSn(sn.trim());
+ recordInfo.setSumNum(sumNum);
+ recordInfo.setRecordList(Collections.synchronizedList(new ArrayList<>()));
+ recordInfo.setLastTime(Instant.now());
+ recordInfo.getRecordList().addAll(recordItems);
+ data.put(key, recordInfo);
+ }else {
+ // 鍚屼竴涓澶囩殑閫氶亾鍚屾璇锋眰鍙�冭檻涓�涓紝鍏朵粬鐨勭洿鎺ュ拷鐣�
+ if (!Objects.equals(sn.trim(), recordInfo.getSn())) {
+ return 0;
+ }
+ recordInfo.getRecordList().addAll(recordItems);
+ recordInfo.setLastTime(Instant.now());
+ }
+ return recordInfo.getRecordList().size();
+ }
+
+ @Scheduled(fixedRate = 5 * 1000) //姣�5绉掓墽琛屼竴娆�, 鍙戠幇鏁版嵁5绉掓湭鏇存柊鍒欑Щ闄ゆ暟鎹苟璁や负鏁版嵁鎺ユ敹瓒呮椂
+ private void timerTask(){
+ Set<String> keys = data.keySet();
+ // 鑾峰彇浜旂鍓嶇殑鏃跺埢
+ Instant instantBefore5S = Instant.now().minusMillis(TimeUnit.SECONDS.toMillis(5));
+ for (String key : keys) {
+ RecordInfo recordInfo = data.get(key);
+ // 瓒呰繃浜旂鏀朵笉鍒版秷鎭换鍔¤秴鏃讹紝 鍙洿鏂拌繖涓�閮ㄥ垎鏁版嵁
+ if ( recordInfo.getLastTime().isBefore(instantBefore5S)) {
+ // 澶勭悊褰曞儚鏁版嵁锛� 杩斿洖缁欏墠绔�
+ String msgKey = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + recordInfo.getDeviceId() + recordInfo.getSn();
+
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(0);
+ wvpResult.setMsg("success");
+ // 瀵规暟鎹繘琛屾帓搴�
+ Collections.sort(recordInfo.getRecordList());
+ wvpResult.setData(recordInfo);
+
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(msgKey);
+ msg.setData(wvpResult);
+ deferredResultHolder.invokeAllResult(msg);
+ data.remove(key);
+ }
+ }
+ }
+
+ public boolean isComplete(String deviceId, String sn) {
+ RecordInfo recordInfo = data.get(deviceId + sn);
+ return recordInfo != null && recordInfo.getRecordList().size() == recordInfo.getSumNum();
+ }
+
+ public RecordInfo getRecordInfo(String deviceId, String sn) {
+ return data.get(deviceId + sn);
+ }
+
+ public void remove(String deviceId, String sn) {
+ data.remove(deviceId + sn);
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
index 8d72a28..85bc39d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
@@ -76,8 +76,8 @@
}
- public ClientTransaction getTransactionByStream(String deviceId, String channelId, String stream){
- SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, null, stream);
+ public ClientTransaction getTransaction(String deviceId, String channelId, String stream, String callId){
+ SsrcTransaction ssrcTransaction = getSsrcTransaction(deviceId, channelId, callId, stream);
if (ssrcTransaction == null) {
return null;
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java
deleted file mode 100644
index 8a2e900..0000000
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/CheckForAllRecordsThread.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.genersoft.iot.vmp.gb28181.transmit.callback;
-
-import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
-import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
-import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.RecordInfoResponseMessageHandler;
-import com.genersoft.iot.vmp.utils.redis.RedisUtil;
-import org.slf4j.Logger;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@SuppressWarnings("unchecked")
-public class CheckForAllRecordsThread extends Thread {
-
- private String key;
-
- private RecordInfo recordInfo;
-
- private RedisUtil redis;
-
- private Logger logger;
-
- private DeferredResultHolder deferredResultHolder;
-
- public CheckForAllRecordsThread(String key, RecordInfo recordInfo) {
- this.key = key;
- this.recordInfo = recordInfo;
- }
-
- @Override
- public void run() {
-
- String cacheKey = this.key;
-
- for (long stop = System.nanoTime() + TimeUnit.SECONDS.toNanos(10); stop > System.nanoTime();) {
- List<Object> cacheKeys = redis.scan(cacheKey + "_*");
- List<RecordItem> totalRecordList = new ArrayList<RecordItem>();
- 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() + "椤�");
- } else {
- logger.info("褰曞儚鏁版嵁宸插叏閮ㄨ幏鍙栵紝鍏� {} 椤�", this.recordInfo.getSumNum());
- this.recordInfo.setRecordList(totalRecordList);
- for (int i = 0; i < cacheKeys.size(); i++) {
- redis.del(cacheKeys.get(i).toString());
- }
- break;
- }
- }
- // 鑷劧椤哄簭鎺掑簭, 鍏冪礌杩涜鍗囧簭鎺掑垪
- this.recordInfo.getRecordList().sort(Comparator.naturalOrder());
- RequestMessage msg = new RequestMessage();
- msg.setKey(DeferredResultHolder.CALLBACK_CMD_RECORDINFO + recordInfo.getDeviceId() + recordInfo.getSn());
- msg.setData(recordInfo);
- deferredResultHolder.invokeAllResult(msg);
- logger.info("澶勭悊瀹屾垚锛岃繑鍥炵粨鏋�");
- RecordInfoResponseMessageHandler.threadNameList.remove(cacheKey);
- }
-
- public void setRedis(RedisUtil redis) {
- this.redis = redis;
- }
-
- public void setDeferredResultHolder(DeferredResultHolder deferredResultHolder) {
- this.deferredResultHolder = deferredResultHolder;
- }
-
- public void setLogger(Logger logger) {
- this.logger = logger;
- }
-
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
index 567bcac..f2e524e 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
@@ -370,7 +370,7 @@
//
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
- content.append("o="+ sipConfig.getId()+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
+ content.append("o="+ channelId+" 0 0 IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
content.append("s=Play\r\n");
content.append("c=IN IP4 "+ mediaServerItem.getSdpIp() +"\r\n");
content.append("t=0 0\r\n");
@@ -389,8 +389,7 @@
content.append("a=rtpmap:126 H264/90000\r\n");
content.append("a=rtpmap:125 H264S/90000\r\n");
content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
- content.append("a=rtpmap:99 MP4V-ES/90000\r\n");
- content.append("a=fmtp:99 profile-level-id=3\r\n");
+ content.append("a=rtpmap:99 H265/90000\r\n");
content.append("a=rtpmap:98 H264/90000\r\n");
content.append("a=rtpmap:97 MPEG4/90000\r\n");
if("TCP-PASSIVE".equals(streamMode)){ // tcp琚姩妯″紡
@@ -402,16 +401,17 @@
}
}else {
if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
}else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
}else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
}
content.append("a=recvonly\r\n");
content.append("a=rtpmap:96 PS/90000\r\n");
content.append("a=rtpmap:98 H264/90000\r\n");
content.append("a=rtpmap:97 MPEG4/90000\r\n");
+ content.append("a=rtpmap:99 H265/90000\r\n");
if ("TCP-PASSIVE".equals(streamMode)) { // tcp琚姩妯″紡
content.append("a=setup:passive\r\n");
content.append("a=connection:new\r\n");
@@ -467,7 +467,7 @@
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
- content.append("o="+sipConfig.getId()+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+ content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
content.append("s=Playback\r\n");
content.append("u="+channelId+":0\r\n");
content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
@@ -490,8 +490,7 @@
content.append("a=rtpmap:126 H264/90000\r\n");
content.append("a=rtpmap:125 H264S/90000\r\n");
content.append("a=fmtp:125 profile-level-id=42e01e\r\n");
- content.append("a=rtpmap:99 MP4V-ES/90000\r\n");
- content.append("a=fmtp:99 profile-level-id=3\r\n");
+ content.append("a=rtpmap:99 H265/90000\r\n");
content.append("a=rtpmap:98 H264/90000\r\n");
content.append("a=rtpmap:97 MPEG4/90000\r\n");
if("TCP-PASSIVE".equals(streamMode)){ // tcp琚姩妯″紡
@@ -503,16 +502,17 @@
}
}else {
if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
}else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
}else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
}
content.append("a=recvonly\r\n");
content.append("a=rtpmap:96 PS/90000\r\n");
- content.append("a=rtpmap:98 H264/90000\r\n");
content.append("a=rtpmap:97 MPEG4/90000\r\n");
+ content.append("a=rtpmap:98 H264/90000\r\n");
+ content.append("a=rtpmap:99 H265/90000\r\n");
if("TCP-PASSIVE".equals(streamMode)){ // tcp琚姩妯″紡
content.append("a=setup:passive\r\n");
content.append("a=connection:new\r\n");
@@ -577,7 +577,7 @@
StringBuffer content = new StringBuffer(200);
content.append("v=0\r\n");
- content.append("o="+sipConfig.getId()+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
+ content.append("o="+channelId+" 0 0 IN IP4 " + mediaServerItem.getSdpIp() + "\r\n");
content.append("s=Download\r\n");
content.append("u="+channelId+":0\r\n");
content.append("c=IN IP4 "+mediaServerItem.getSdpIp()+"\r\n");
@@ -613,16 +613,17 @@
}
}else {
if("TCP-PASSIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
}else if ("TCP-ACTIVE".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" TCP/RTP/AVP 96 97 98 99\r\n");
}else if("UDP".equals(streamMode)) {
- content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 98 97\r\n");
+ content.append("m=video "+ ssrcInfo.getPort() +" RTP/AVP 96 97 98 99\r\n");
}
content.append("a=recvonly\r\n");
content.append("a=rtpmap:96 PS/90000\r\n");
- content.append("a=rtpmap:98 H264/90000\r\n");
content.append("a=rtpmap:97 MPEG4/90000\r\n");
+ content.append("a=rtpmap:98 H264/90000\r\n");
+ content.append("a=rtpmap:99 H265/90000\r\n");
if("TCP-PASSIVE".equals(streamMode)){ // tcp琚姩妯″紡
content.append("a=setup:passive\r\n");
content.append("a=connection:new\r\n");
@@ -651,6 +652,17 @@
(MediaServerItem mediaServerItemInUse, JSONObject json)->{
hookEvent.call(new InviteStreamInfo(mediaServerItem, json, callIdHeader.getCallId(), "rtp", ssrcInfo.getStream()));
subscribe.removeSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey);
+ subscribeKey.put("regist", false);
+ subscribeKey.put("schema", "rtmp");
+ // 娣诲姞娴佹敞閿�鐨勮闃咃紝娉ㄩ攢浜嗗悗鍚戣澶囧彂閫乥ye
+ subscribe.addSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, subscribeKey,
+ (MediaServerItem mediaServerItemForEnd, JSONObject jsonForEnd)->{
+ ClientTransaction transaction = streamSession.getTransaction(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
+ if (transaction != null) {
+ logger.info("[褰曞儚]涓嬭浇缁撴潫锛� 鍙戦�丅YE");
+ streamByeCmd(device.getDeviceId(), channelId, ssrcInfo.getStream(), callIdHeader.getCallId());
+ }
+ });
});
Request request = headerProvider.createPlaybackInviteRequest(device, channelId, content.toString(), null, "fromplybck" + tm, null, callIdHeader, ssrcInfo.getSsrc());
@@ -683,10 +695,10 @@
@Override
public void streamByeCmd(String deviceId, String channelId, String stream, String callId, SipSubscribe.Event okEvent) {
try {
- SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, null, stream);
- ClientTransaction transaction = streamSession.getTransactionByStream(deviceId, channelId, stream);
+ SsrcTransaction ssrcTransaction = streamSession.getSsrcTransaction(deviceId, channelId, callId, stream);
+ ClientTransaction transaction = streamSession.getTransaction(deviceId, channelId, stream, callId);
- if (transaction == null) {
+ if (transaction == null ) {
logger.warn("[ {} -> {}]鍋滄瑙嗛娴佺殑鏃跺�欏彂鐜颁簨鍔″凡涓㈠け", deviceId, channelId);
SipSubscribe.EventResult<Object> eventResult = new SipSubscribe.EventResult<>();
if (okEvent != null) {
@@ -1663,6 +1675,7 @@
sipSubscribe.addErrorSubscribe(callIdHeader.getCallId(), (eventResult -> {
errorEvent.response(eventResult);
sipSubscribe.removeErrorSubscribe(eventResult.callId);
+ sipSubscribe.removeOkSubscribe(eventResult.callId);
}));
}
// 娣诲姞璁㈤槄
@@ -1670,6 +1683,7 @@
sipSubscribe.addOkSubscribe(callIdHeader.getCallId(), eventResult ->{
okEvent.response(eventResult);
sipSubscribe.removeOkSubscribe(eventResult.callId);
+ sipSubscribe.removeErrorSubscribe(eventResult.callId);
});
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
index 1ba1b3e..2723da4 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
@@ -40,7 +40,7 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
import java.text.ParseException;
-import java.util.Date;
+import java.time.Instant;
import java.util.Vector;
/**
@@ -180,16 +180,16 @@
Long startTime = null;
Long stopTime = null;
- Date start = null;
- Date end = null;
+ Instant start = null;
+ Instant end = null;
if (sdp.getTimeDescriptions(false) != null && sdp.getTimeDescriptions(false).size() > 0) {
TimeDescriptionImpl timeDescription = (TimeDescriptionImpl)(sdp.getTimeDescriptions(false).get(0));
TimeField startTimeFiled = (TimeField)timeDescription.getTime();
startTime = startTimeFiled.getStartTime();
stopTime = startTimeFiled.getStopTime();
- start = new Date(startTime*1000);
- end = new Date(stopTime*1000);
+ start = Instant.ofEpochMilli(startTime*1000);
+ end = Instant.ofEpochMilli(stopTime*1000);
}
// 鑾峰彇鏀寔鐨勬牸寮�
Vector mediaDescriptions = sdp.getMediaDescriptions(true);
@@ -331,12 +331,12 @@
sendRtpItem.setApp("rtp");
if ("Playback".equals(sessionName)) {
sendRtpItem.setPlayType(InviteStreamType.PLAYBACK);
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, null, true, true);
sendRtpItem.setStreamId(ssrcInfo.getStream());
// 鍐欏叆redis锛� 瓒呮椂鏃跺洖澶�
redisCatchStorage.updateSendRTPSever(sendRtpItem);
- playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, DateUtil.format.format(start),
- DateUtil.format.format(end), null, result -> {
+ playService.playBack(mediaServerItem, ssrcInfo, device.getDeviceId(), channelId, DateUtil.formatter.format(start),
+ DateUtil.formatter.format(end), null, result -> {
if (result.getCode() != 0){
logger.warn("褰曞儚鍥炴斁澶辫触");
if (result.getEvent() != null) {
@@ -372,7 +372,7 @@
if (mediaServerItem.isRtpEnable()) {
streamId = String.format("%s_%s", device.getDeviceId(), channelId);
}
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, true);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, true, false);
sendRtpItem.setStreamId(ssrcInfo.getStream());
// 鍐欏叆redis锛� 瓒呮椂鏃跺洖澶�
redisCatchStorage.updateSendRTPSever(sendRtpItem);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 594c41a..1c05440 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -81,7 +81,7 @@
try {
RequestEventExt evtExt = (RequestEventExt) evt;
String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
- logger.info("[{}] 鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�", requestAddress);
+ logger.info("[娉ㄥ唽璇锋眰] 寮�濮嬪鐞�: {}", requestAddress);
Request request = evt.getRequest();
ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
Response response = null;
@@ -95,7 +95,7 @@
AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
if (authHead == null) {
- logger.info("[{}] 鏈惡甯︽巿鏉冨ご 鍥炲401", requestAddress);
+ logger.info("[娉ㄥ唽璇锋眰] 鏈惡甯︽巿鏉冨ご 鍥炲401: {}", requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
sendResponse(evt, response);
@@ -111,7 +111,7 @@
// 娉ㄥ唽澶辫触
response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
response.setReasonPhrase("wrong password");
- logger.info("[{}] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403", requestAddress);
+ logger.info("[娉ㄥ唽璇锋眰] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403: {}", requestAddress);
sendResponse(evt, response);
return;
}
@@ -176,11 +176,11 @@
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
if (registerFlag) {
- logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + deviceId, requestAddress);
+ logger.info("[娉ㄥ唽鎴愬姛] deviceId: {}->{}", deviceId, requestAddress);
device.setRegisterTime(DateUtil.getNow());
deviceService.online(device);
} else {
- logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + deviceId, requestAddress);
+ logger.info("[娉ㄩ攢鎴愬姛] deviceId: {}->{}" ,deviceId, requestAddress);
deviceService.offline(deviceId);
}
} catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
@@ -192,7 +192,7 @@
private void sendResponse(RequestEvent evt, Response response) throws InvalidArgumentException, SipException {
ServerTransaction serverTransaction = getServerTransaction(evt);
if (serverTransaction == null) {
- logger.warn("鍥炲澶辫触锛歿}", response);
+ logger.warn("[鍥炲澶辫触]锛歿}", response);
return;
}
serverTransaction.sendResponse(response);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
index a628083..d5d4c1d 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java
@@ -24,8 +24,6 @@
import javax.sip.header.ViaHeader;
import javax.sip.message.Response;
import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
@Component
public class KeepaliveNotifyMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
index e36a705..4cf9768 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/MediaStatusNotifyMessageHandler.java
@@ -60,10 +60,9 @@
CallIdHeader callIdHeader = (CallIdHeader)evt.getRequest().getHeader(CallIdHeader.NAME);
String NotifyType =getText(rootElement, "NotifyType");
if (NotifyType.equals("121")){
- logger.info("濯掍綋鎾斁瀹屾瘯锛岄�氱煡鍏虫祦");
+ logger.info("[褰曞儚娴乚鎺ㄩ�佸畬姣曪紝鏀跺埌鍏虫祦閫氱煡");
String channelId =getText(rootElement, "DeviceID");
-// redisCatchStorage.stopPlayback(device.getDeviceId(), channelId, null, callIdHeader.getCallId());
-// redisCatchStorage.stopDownload(device.getDeviceId(), channelId, null, callIdHeader.getCallId());
+ // 鏌ヨ鏄澶�
StreamInfo streamInfo = redisCatchStorage.queryDownload(device.getDeviceId(), channelId, null, callIdHeader.getCallId());
// 璁剧疆杩涘害100%
streamInfo.setProgress(1);
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..4509e42 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
@@ -5,14 +5,14 @@
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
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;
@@ -20,19 +20,20 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
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 static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;
+/**
+ * @author lin
+ */
@Component
public class RecordInfoResponseMessageHandler extends SIPRequestProcessorParent implements InitializingBean, IMessageHandler {
@@ -45,10 +46,12 @@
private ResponseMessageHandler responseMessageHandler;
@Autowired
- private RedisUtil redis;
+ private RecordDataCatch recordDataCatch;
@Autowired
private DeferredResultHolder deferredResultHolder;
+
+
@Autowired
private EventPublisher eventPublisher;
@@ -66,32 +69,22 @@
responseAck(evt, Response.OK);
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")));
+
+ String sumNumStr = getText(rootElement, "SumNum");
+ int sumNum = 0;
+ if (!StringUtils.isEmpty(sumNumStr)) {
+ sumNum = Integer.parseInt(sumNumStr);
}
Element recordListElement = rootElement.element("RecordList");
- if (recordListElement == null || recordInfo.getSumNum() == 0) {
+ if (recordListElement == null || sumNum == 0) {
logger.info("鏃犲綍鍍忔暟鎹�");
- eventPublisher.recordEndEventPush(recordInfo);
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setData(recordInfo);
- deferredResultHolder.invokeAllResult(msg);
+ recordDataCatch.put(device.getDeviceId(), sn, sumNum, new ArrayList<>());
+ releaseRequest(device.getDeviceId(), sn);
} else {
Iterator<Element> recordListIterator = recordListElement.elementIterator();
- List<RecordItem> recordList = new ArrayList<RecordItem>();
if (recordListIterator != null) {
- RecordItem record = new RecordItem();
- logger.info("澶勭悊褰曞儚鍒楄〃鏁版嵁...");
+ List<RecordItem> recordList = new ArrayList<>();
// 閬嶅巻DeviceList
while (recordListIterator.hasNext()) {
Element itemRecord = recordListIterator.next();
@@ -100,43 +93,31 @@
logger.info("璁板綍涓虹┖锛屼笅涓�涓�...");
continue;
}
- record = new RecordItem();
+ 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"));
- record.setStartTime(
- DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "StartTime")));
- record.setEndTime(
- DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(getText(itemRecord, "EndTime")));
+
+ 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);
+ int count = recordDataCatch.put(device.getDeviceId(), sn, sumNum, recordList);
+ logger.info("[鍥芥爣褰曞儚]锛� {}->{}: {}/{}", device.getDeviceId(), sn, count, sumNum);
}
- 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.");
- }
+
+ if (recordDataCatch.isComplete(device.getDeviceId(), sn)){
+ releaseRequest(device.getDeviceId(), sn);
}
}
} catch (SipException e) {
@@ -154,4 +135,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);
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
index 0261209..138af7a 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
@@ -89,7 +89,7 @@
});
// 鑾峰彇zlm淇℃伅
- logger.info("[zlm鎺ュ叆]绛夊緟榛樿zlm涓�...");
+ logger.info("[zlm] 绛夊緟榛樿zlm涓�...");
// 鑾峰彇鎵�鏈夌殑zlm锛� 骞跺紑鍚富鍔ㄨ繛鎺�
List<MediaServerItem> all = mediaServerService.getAllFromDatabase();
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
index b193add..f4a9feb 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/event/ZLMStatusEventListener.java
@@ -39,8 +39,7 @@
@Async
@EventListener
public void onApplicationEvent(ZLMOnlineEvent event) {
-
- logger.info("銆怹LM涓婄嚎銆慖D锛�" + event.getMediaServerId());
+ logger.info("[ZLM] 涓婄嚎 ID锛�" + event.getMediaServerId());
streamPushService.zlmServerOnline(event.getMediaServerId());
streamProxyService.zlmServerOnline(event.getMediaServerId());
@@ -50,7 +49,7 @@
@EventListener
public void onApplicationEvent(ZLMOfflineEvent event) {
- logger.info("ZLM绂荤嚎浜嬩欢瑙﹀彂锛孖D锛�" + event.getMediaServerId());
+ logger.info("[ZLM] 绂荤嚎锛孖D锛�" + event.getMediaServerId());
// 澶勭悊ZLM绂荤嚎
mediaServerService.zlmServerOffline(event.getMediaServerId());
streamProxyService.zlmServerOffline(event.getMediaServerId());
diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
index 4614ee7..e216c65 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
@@ -44,7 +44,7 @@
void updateVmServer(List<MediaServerItem> mediaServerItemList);
- SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck);
+ SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback);
SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, String ssrc, boolean ssrcCheck, boolean isPlayback);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index 9ac4d31..0144e83 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -11,24 +11,18 @@
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.service.IMediaServerService;
-import com.genersoft.iot.vmp.service.IMediaService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
-import javax.sip.DialogState;
-import javax.sip.TimeoutEvent;
-import java.text.ParseException;
-import java.util.Calendar;
-import java.util.Date;
+import java.time.Instant;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* 璁惧涓氬姟锛堢洰褰曡闃咃級
@@ -66,7 +60,7 @@
@Override
public void online(Device device) {
- logger.info("[璁惧涓婄嚎]锛宒eviceId锛�" + device.getDeviceId());
+ logger.info("[璁惧涓婄嚎] deviceId锛歿}->{}:{}", device.getDeviceId(), device.getIp(), device.getPort());
Device deviceInRedis = redisCatchStorage.getDevice(device.getDeviceId());
Device deviceInDb = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
@@ -101,9 +95,7 @@
// 鍒锋柊杩囨湡浠诲姟
String registerExpireTaskKey = registerExpireTaskKeyPrefix + device.getDeviceId();
dynamicTask.stop(registerExpireTaskKey);
- dynamicTask.startDelay(registerExpireTaskKey, ()->{
- offline(device.getDeviceId());
- }, device.getExpires() * 1000);
+ dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), device.getExpires() * 1000);
}
@Override
@@ -217,18 +209,9 @@
@Override
public boolean expire(Device device) {
- Date registerTimeDate;
- try {
- registerTimeDate = DateUtil.format.parse(device.getRegisterTime());
- } catch (ParseException e) {
- logger.error("璁惧鏃堕棿鏍煎紡鍖栧け璐ワ細{}->{} ", device.getDeviceId(), device.getRegisterTime() );
- return false;
- }
- int expires = device.getExpires();
- Calendar calendarForExpire = Calendar.getInstance();
- calendarForExpire.setTime(registerTimeDate);
- calendarForExpire.set(Calendar.SECOND, calendarForExpire.get(Calendar.SECOND) + expires);
- return calendarForExpire.before(DateUtil.getNow());
+ Instant registerTimeDate = Instant.from(DateUtil.formatter.parse(device.getRegisterTime()));
+ Instant expireInstant = registerTimeDate.plusMillis(TimeUnit.SECONDS.toMillis(device.getExpires()));
+ return expireInstant.isBefore(Instant.now());
}
@Override
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
index a690c1b..5468fae 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
@@ -95,7 +95,7 @@
*/
@Override
public void updateVmServer(List<MediaServerItem> mediaServerItemList) {
- logger.info("[缂撳瓨鍒濆鍖朷 Media Server ");
+ logger.info("[zlm] 缂撳瓨鍒濆鍖� ");
for (MediaServerItem mediaServerItem : mediaServerItemList) {
if (StringUtils.isEmpty(mediaServerItem.getId())) {
continue;
@@ -116,8 +116,8 @@
}
@Override
- public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck) {
- return openRTPServer(mediaServerItem, streamId, null, ssrcCheck,false);
+ public SSRCInfo openRTPServer(MediaServerItem mediaServerItem, String streamId, boolean ssrcCheck, boolean isPlayback) {
+ return openRTPServer(mediaServerItem, streamId, null, ssrcCheck,isPlayback);
}
@Override
@@ -352,7 +352,7 @@
*/
@Override
public void zlmServerOnline(ZLMServerConfig zlmServerConfig) {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]姝ｅ湪杩炴帴",
+ logger.info("[ZLM] 姝ｅ湪杩炴帴 : {} -> {}:{}",
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
MediaServerItem serverItem = mediaServerMapper.queryOne(zlmServerConfig.getGeneralMediaServerId());
@@ -405,7 +405,7 @@
setZLMConfig(serverItem, "0".equals(zlmServerConfig.getHookEnable()));
}
publisher.zlmOnlineEventPublish(serverItem.getId());
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]杩炴帴鎴愬姛",
+ logger.info("[ZLM] 杩炴帴鎴愬姛 {} - {}:{} ",
zlmServerConfig.getGeneralMediaServerId(), zlmServerConfig.getIp(), zlmServerConfig.getHttpPort());
}
@@ -483,7 +483,7 @@
*/
@Override
public void setZLMConfig(MediaServerItem mediaServerItem, boolean restart) {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]姝ｅ湪璁剧疆zlm",
+ logger.info("[ZLM] 姝ｅ湪璁剧疆 锛歿} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
String protocol = sslEnabled ? "https" : "http";
String hookPrex = String.format("%s://%s:%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort);
@@ -527,17 +527,17 @@
if (responseJSON != null && responseJSON.getInteger("code") == 0) {
if (restart) {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm鎴愬姛, 寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥",
+ logger.info("[ZLM] 璁剧疆鎴愬姛,寮�濮嬮噸鍚互淇濊瘉閰嶇疆鐢熸晥 {} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
zlmresTfulUtils.restartServer(mediaServerItem);
}else {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm鎴愬姛",
+ logger.info("[ZLM] 璁剧疆鎴愬姛 {} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}
}else {
- logger.info("[ ZLM锛歿} ]-[ {}:{} ]璁剧疆zlm澶辫触",
+ logger.info("[ZLM] 璁剧疆zlm澶辫触 {} -> {}:{}",
mediaServerItem.getId(), mediaServerItem.getIp(), mediaServerItem.getHttpPort());
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
index 4372f8e..eb3831a 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
@@ -193,7 +193,7 @@
if (mediaServerItem.isRtpEnable()) {
streamId = String.format("%s_%s", device.getDeviceId(), channelId);
}
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck());
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck(), false);
play(mediaServerItem, ssrcInfo, device, channelId, (mediaServerItemInUse, response)->{
if (hookEvent != null) {
hookEvent.response(mediaServerItem, response);
@@ -237,7 +237,7 @@
streamId = String.format("%s_%s", device.getDeviceId(), channelId);
}
if (ssrcInfo == null) {
- ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck());
+ ssrcInfo = mediaServerService.openRTPServer(mediaServerItem, streamId, device.isSsrcCheck(), false);
}
// 瓒呮椂澶勭悊
@@ -360,7 +360,7 @@
return null;
}
MediaServerItem newMediaServerItem = getNewMediaServerItem(device);
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true, true);
return playBack(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, inviteStreamCallback, callback);
}
@@ -447,7 +447,7 @@
return null;
}
MediaServerItem newMediaServerItem = getNewMediaServerItem(device);
- SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true);
+ SSRCInfo ssrcInfo = mediaServerService.openRTPServer(newMediaServerItem, null, true, true);
return download(newMediaServerItem, ssrcInfo, deviceId, channelId, startTime, endTime, downloadSpeed,infoCallBack, hookCallBack);
}
diff --git a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
index 1be0f40..9d37dcd 100644
--- a/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
+++ b/src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
@@ -1,57 +1,58 @@
package com.genersoft.iot.vmp.utils;
-import java.text.ParseException;
+
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
+
import java.util.Locale;
/**
* 鍏ㄥ眬鏃堕棿宸ュ叿绫�
- * @author swwheihei
+ * @author lin
*/
public class DateUtil {
private static final String yyyy_MM_dd_T_HH_mm_ss_SSSXXX = "yyyy-MM-dd'T'HH:mm:ss";
- private static final String yyyy_MM_dd_HH_mm_ss = "yyyy-MM-dd HH:mm:ss";
+ public static final String yyyy_MM_dd_HH_mm_ss = "yyyy-MM-dd HH:mm:ss";
public static final SimpleDateFormat formatISO8601 = new SimpleDateFormat(yyyy_MM_dd_T_HH_mm_ss_SSSXXX, Locale.getDefault());
public static final SimpleDateFormat format = new SimpleDateFormat(yyyy_MM_dd_HH_mm_ss, Locale.getDefault());
- public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
+ public static final DateTimeFormatter formatterISO8601 = DateTimeFormatter.ofPattern(yyyy_MM_dd_T_HH_mm_ss_SSSXXX, Locale.getDefault()).withZone(ZoneId.systemDefault());
+ public static final DateTimeFormatter formatter = DateTimeFormatter.ofPattern(yyyy_MM_dd_HH_mm_ss, Locale.getDefault()).withZone(ZoneId.systemDefault());
- try {
- return formatISO8601.format(format.parse(formatTime));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return "";
+ public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
+ return formatterISO8601.format(formatter.parse(formatTime));
}
public static String ISO8601Toyyyy_MM_dd_HH_mm_ss(String formatTime) {
+ return formatter.format(formatterISO8601.parse(formatTime));
- try {
- return format.format(formatISO8601.parse(formatTime));
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return "";
}
public static long yyyy_MM_dd_HH_mm_ssToTimestamp(String formatTime) {
- //璁剧疆瑕佽鍙栫殑鏃堕棿瀛楃涓叉牸寮�
- Date date;
- try {
- date = format.parse(formatTime);
- Long timestamp=date.getTime()/1000;
- //杞崲涓篋ate绫�
- return timestamp;
- } catch (ParseException e) {
- e.printStackTrace();
- }
- return 0;
+ TemporalAccessor temporalAccessor = formatter.parse(formatTime);
+ Instant instant = Instant.from(temporalAccessor);
+ return instant.getEpochSecond();
}
public static String getNow() {
- return format.format(System.currentTimeMillis());
+ LocalDateTime nowDateTime = LocalDateTime.now();
+ return formatter.format(nowDateTime);
+ }
+
+ public static boolean verification(String timeStr, DateTimeFormatter dateTimeFormatter) {
+ try {
+ LocalDate.parse(timeStr, dateTimeFormatter);
+ return true;
+ }catch (DateTimeParseException exception) {
+ return false;
+ }
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
index 6fdadf2..8cb923a 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/record/GBRecordController.java
@@ -5,6 +5,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.service.IPlayService;
+import com.genersoft.iot.vmp.utils.DateUtil;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +29,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import java.time.LocalDate;
import java.util.UUID;
@Api(tags = "鍥芥爣褰曞儚")
@@ -60,15 +63,32 @@
@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<WVPResult<RecordInfo>>> recordinfo(@PathVariable String deviceId, @PathVariable String channelId, String startTime, String endTime){
if (logger.isDebugEnabled()) {
logger.debug(String.format("褰曞儚淇℃伅鏌ヨ API璋冪敤锛宒eviceId锛�%s 锛宻tartTime锛�%s锛� endTime锛�%s",deviceId, startTime, endTime));
}
+ DeferredResult<ResponseEntity<WVPResult<RecordInfo>>> result = new DeferredResult<>();
+ if (!DateUtil.verification(startTime, DateUtil.formatter)){
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("startTime error, format is " + DateUtil.yyyy_MM_dd_HH_mm_ss);
+
+ ResponseEntity<WVPResult<RecordInfo>> resultResponseEntity = new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ result.setResult(resultResponseEntity);
+ return result;
+ }
+ if (!DateUtil.verification(endTime, DateUtil.formatter)){
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("endTime error, format is " + DateUtil.yyyy_MM_dd_HH_mm_ss);
+ ResponseEntity<WVPResult<RecordInfo>> resultResponseEntity = new ResponseEntity<>(wvpResult, HttpStatus.OK);
+ result.setResult(resultResponseEntity);
+ return result;
+ }
Device device = storager.queryVideoDevice(deviceId);
// 鎸囧畾瓒呮椂鏃堕棿 1鍒嗛挓30绉�
- DeferredResult<ResponseEntity<RecordInfo>> result = new DeferredResult<>(90*1000L);
String uuid = UUID.randomUUID().toString();
int sn = (int)((Math.random()*9+1)*100000);
String key = DeferredResultHolder.CALLBACK_CMD_RECORDINFO + deviceId + sn;
@@ -76,7 +96,10 @@
msg.setId(uuid);
msg.setKey(key);
cmder.recordInfoQuery(device, channelId, startTime, endTime, sn, null, null, null, (eventResult -> {
- msg.setData("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg );
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("鏌ヨ褰曞儚澶辫触, status: " + eventResult.statusCode + ", message: " + eventResult.msg);
+ msg.setData(wvpResult);
resultHolder.invokeResult(msg);
}));
@@ -84,6 +107,10 @@
resultHolder.put(key, uuid, result);
result.onTimeout(()->{
msg.setData("timeout");
+ WVPResult<RecordInfo> wvpResult = new WVPResult<>();
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("timeout");
+ msg.setData(wvpResult);
resultHolder.invokeResult(msg);
});
return result;
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 3f148d6..1233a89 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -28,7 +28,7 @@
poolMaxIdle: 500
# [鍙�塢 鏈�澶х殑绛夊緟鏃堕棿(绉�)
poolMaxWait: 5
- # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
+ # [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b1950c5..3531431 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -16,7 +16,6 @@
password: face2020
# [鍙�塢 瓒呮椂鏃堕棿
timeout: 10000
- # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
# mysql鏁版嵁婧�
datasource:
type: com.alibaba.druid.pool.DruidDataSource
diff --git a/src/main/resources/application-docker.yml b/src/main/resources/application-docker.yml
index 6487f9a..1653a58 100644
--- a/src/main/resources/application-docker.yml
+++ b/src/main/resources/application-docker.yml
@@ -16,7 +16,7 @@
password: ${REDIS_PWD:root}
# [鍙�塢 瓒呮椂鏃堕棿
timeout: 10000
- # [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
+ # [蹇呴�塢 jdbc鏁版嵁搴撻厤缃�
datasource:
# 浣跨敤mysql 鎵撳紑23-28琛屾敞閲婏紝 鍒犻櫎29-36琛�
name: wvp
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index f7e4e40..9c7ab8e 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -244,7 +244,7 @@
});
},
queryRecords: function (itemData) {
- var format = moment().format("YYYY-M-D");
+ var format = moment().format("yyyy-MM-DD");
let deviceId = this.deviceId;
let channelId = itemData.channelId;
this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date: format})
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index f0b4512..921e413 100644
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -453,9 +453,19 @@
method: 'get',
url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + startTime + '&endTime=' + endTime
}).then(function (res) {
- // 澶勭悊鏃堕棿淇℃伅
- that.videoHistory.searchHistoryResult = res.data.recordList;
- that.recordsLoading = false;
+ console.log(res)
+ if(res.data.code === 0) {
+ // 澶勭悊鏃堕棿淇℃伅
+ that.videoHistory.searchHistoryResult = res.data.data.recordList;
+ that.recordsLoading = false;
+ }else {
+ this.$message({
+ showClose: true,
+ message: res.data.msg,
+ type: "error",
+ });
+ }
+
}).catch(function (e) {
console.log(e.message);
// that.videoHistory.searchHistoryResult = falsificationData.recordData;
@@ -671,7 +681,11 @@
this.$axios({
method: 'get',
url: `/api/playback/seek/${this.streamId }/` + Math.floor(this.seekTime * val / 100000)
- }).then(function (res) {});
+ }).then( (res)=> {
+ setTimeout(()=>{
+ this.$refs.videoPlayer.play(this.videoUrl)
+ }, 600)
+ });
}
}
diff --git a/web_src/src/components/dialog/recordDownload.vue b/web_src/src/components/dialog/recordDownload.vue
index 6b7ca1f..c50e4ce 100644
--- a/web_src/src/components/dialog/recordDownload.vue
+++ b/web_src/src/components/dialog/recordDownload.vue
@@ -172,6 +172,7 @@
isEnd: true,
}
}).then((res) => {
+ console.log(res)
if (res.data.code == 0) {
this.percentage = parseFloat(res.data.data.percentage)*100
if (res.data.data[0].percentage === '1') {
--
Gitblit v1.8.0