Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #399 from nikmu/wvp-28181-2.0

Browse Source 
修复device_channel的Id改变带来的tree查询bug
This commit is contained in:
648540858 2022-03-16 16:42:50 +08:00 committed by GitHub
commit e1f24ef254
7 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
View File

@ -225,7 +225,7 @@ public class SIPRequestHeaderProvider {
return request;
}
public Request createInfoRequest(Device device, StreamInfo streamInfo, String content, Long cseq)
public Request createInfoRequest(Device device, StreamInfo streamInfo, String content)
throws PeerUnavailableException, ParseException, InvalidArgumentException {
Request request = null;
if (streamInfo == null) return null;
@ -255,9 +255,8 @@ public class SIPRequestHeaderProvider {
// Forwards
MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70);
if (cseq == null) {
cseq = redisCatchStorage.getCSEQ(Request.INFO);
}
cseq = redisCatchStorage.getCSEQ(Request.INVITE);
// ceq
CSeqHeader cSeqHeader = sipFactory.createHeaderFactory()
.createCSeqHeader(cseq, Request.INFO);

8
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -1620,7 +1620,7 @@ public class SIPCommander implements ISIPCommander {
content.append("PAUSE RTSP/1.0\r\n");
content.append("CSeq: " + cseq + "\r\n");
content.append("PauseTime: now\r\n");
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
if (request == null) {
return;
}
@ -1651,7 +1651,7 @@ public class SIPCommander implements ISIPCommander {
content.append("PLAY RTSP/1.0\r\n");
content.append("CSeq: " + cseq + "\r\n");
content.append("Range: npt=now-\r\n");
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
if (request == null) return;
logger.info(request.toString());
ClientTransaction clientTransaction = null;
@ -1680,7 +1680,7 @@ public class SIPCommander implements ISIPCommander {
content.append("CSeq: " + cseq + "\r\n");
content.append("Range: npt=" + Math.abs(seekTime) + "-\r\n");
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
if (request == null) return;
logger.info(request.toString());
ClientTransaction clientTransaction = null;
@ -1708,7 +1708,7 @@ public class SIPCommander implements ISIPCommander {
content.append("PLAY RTSP/1.0\r\n");
content.append("CSeq: " + cseq + "\r\n");
content.append("Scale: " + String.format("%.1f",speed) + "\r\n");
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString(), cseq);
Request request = headerProvider.createInfoRequest(device, streamInfo, content.toString());
if (request == null) return;
logger.info(request.toString());
ClientTransaction clientTransaction = null;

14
src/main/java/com/genersoft/iot/vmp/utils/node/BaseNode.java
View File

@ -16,7 +16,7 @@ public class BaseNode<T> implements INode<T> {
/**
* 主键ID
*/
protected int id;
protected String channelId;
/**
* 父节点ID
@ -50,12 +50,8 @@ public class BaseNode<T> implements INode<T> {
}
@Override
public int getId() {
return id;
}
public void setId(int id) {
this.id = id;
public String getChannelId() {
return channelId;
}
@Override
@ -63,10 +59,6 @@ public class BaseNode<T> implements INode<T> {
return parentId;
}
public void setParentId(String parentId) {
this.parentId = parentId;
}
@Override
public List<T> getChildren() {
return children;

4
src/main/java/com/genersoft/iot/vmp/utils/node/ForestNode.java
View File

@ -15,8 +15,8 @@ public class ForestNode extends BaseNode<ForestNode> {
*/
private Object content;
public ForestNode(int id, String parentId, Object content) {
this.id = id;
public ForestNode(String id, String parentId, Object content) {
this.channelId = id;
this.parentId = parentId;
this.content = content;
}

10
src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeManager.java
View File

@ -17,15 +17,15 @@ public class ForestNodeManager<T extends INode<T>> {
/**
* 森林的所有节点
*/
private final ImmutableMap<Integer, T> nodeMap;
private final ImmutableMap<String, T> nodeMap;
/**
* 森林的父节点ID
*/
private final Map<Integer, Object> parentIdMap = Maps.newHashMap();
private final Map<String, Object> parentIdMap = Maps.newHashMap();
public ForestNodeManager(List<T> nodes) {
nodeMap = Maps.uniqueIndex(nodes, INode::getId);
nodeMap = Maps.uniqueIndex(nodes, INode::getChannelId);
}
/**
@ -46,7 +46,7 @@ public class ForestNodeManager<T extends INode<T>> {
*
* @param parentId 父节点ID
*/
public void addParentId(int parentId) {
public void addParentId(String parentId) {
parentIdMap.put(parentId, "");
}
@ -58,7 +58,7 @@ public class ForestNodeManager<T extends INode<T>> {
public List<T> getRoot() {
List<T> roots = new ArrayList<>();
nodeMap.forEach((key, node) -> {
if (node.getParentId() == null || parentIdMap.containsKey(node.getId())) {
if (node.getParentId() == null || parentIdMap.containsKey(node.getChannelId())) {
roots.add(node);
}
});

6
src/main/java/com/genersoft/iot/vmp/utils/node/ForestNodeMerger.java
View File

@ -25,7 +25,7 @@ public class ForestNodeMerger {
if (node != null) {
node.getChildren().add(forestNode);
} else {
forestNodeManager.addParentId(forestNode.getId());
forestNodeManager.addParentId(forestNode.getChannelId());
}
}
});
@ -37,8 +37,8 @@ public class ForestNodeMerger {
items.forEach(forestNode -> {
if (forestNode.getParentId() != null) {
INode<T> node = forestNodeManager.getTreeNodeAt(forestNode.getParentId());
if (CollectionUtil.contains(parentIds, forestNode.getId())){
forestNodeManager.addParentId(forestNode.getId());
if (CollectionUtil.contains(parentIds, forestNode.getChannelId())){
forestNodeManager.addParentId(forestNode.getChannelId());
} else {
if (node != null){
node.getChildren().add(forestNode);

2
src/main/java/com/genersoft/iot/vmp/utils/node/INode.java
View File

@ -14,7 +14,7 @@ public interface INode<T> extends Serializable {
*
* @return String
*/
int getId();
String getChannelId();
/**
* 父主键