XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wvp-28181-2.0' into main-dev

Browse Source 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
This commit is contained in:
648540858
2024-03-08 09:30:48 +08:00
parent a90098b90b d8b24fc795
commit 1fcdf5a8f3
6 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java
View File

@@ -136,7 +136,7 @@ public class PlatformChannelServiceImpl implements IPlatformChannelService {
deviceChannelList.add(deviceChannel);
}
return deviceChannelList;
} else if (catalog == null || !catalogId.equals(platform.getDeviceGBId())) {
} else if (catalog == null && !catalogId.equals(platform.getDeviceGBId())) {
logger.warn("未查询到目录{}的信息", catalogId);
return null;
}

10
src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
View File

@@ -43,16 +43,15 @@ import javax.sip.InvalidArgumentException;
import javax.sip.ResponseEvent;
import javax.sip.PeerUnavailableException;
import javax.sip.SipException;
import javax.sip.SipFactory;
import javax.sip.address.Address;
import javax.sip.address.SipURI;
import javax.sip.header.*;
import javax.sip.message.Request;
import java.text.ParseException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;
/**
@@ -392,7 +391,6 @@ public class PlatformServiceImpl implements IPlatformService {
()-> registerTask(platform, null),
userSetting.getRegisterAgainAfterTime() * 1000);
}
}
}