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

MANSCDP 结构调整

Browse Source 
MANSCDPUtils.Builder
编码测试
This commit is contained in:
shikong 2023-09-25 00:21:25 +08:00
parent b443e720b3
commit 6efb97875f
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/CatalogDeviceListDTO.java → gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/query/CatalogDeviceListDTO.java
View File

@ -1,4 +1,4 @@
package cn.skcks.docking.gb28181.sip.manscdp.catalog; package cn.skcks.docking.gb28181.sip.manscdp.catalog.query;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;

2
gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/CatalogItemDTO.java → gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/query/CatalogItemDTO.java
View File

@ -1,4 +1,4 @@
package cn.skcks.docking.gb28181.sip.manscdp.catalog; package cn.skcks.docking.gb28181.sip.manscdp.catalog.query;
import cn.skcks.docking.gb28181.constant.GB28181Constant; import cn.skcks.docking.gb28181.constant.GB28181Constant;

2
gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/CatalogQueryDTO.java → gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/query/CatalogQueryDTO.java
View File

@ -1,4 +1,4 @@
package cn.skcks.docking.gb28181.sip.manscdp.catalog; package cn.skcks.docking.gb28181.sip.manscdp.catalog.query;
import cn.skcks.docking.gb28181.constant.CmdType; import cn.skcks.docking.gb28181.constant.CmdType;

3
gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/CatalogResponseDTO.java → gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/manscdp/catalog/response/CatalogResponseDTO.java
View File

@ -1,6 +1,7 @@
package cn.skcks.docking.gb28181.sip.manscdp.catalog; package cn.skcks.docking.gb28181.sip.manscdp.catalog.response;
import cn.skcks.docking.gb28181.constant.CmdType; import cn.skcks.docking.gb28181.constant.CmdType;
import cn.skcks.docking.gb28181.sip.manscdp.catalog.query.CatalogDeviceListDTO;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

16
gb28181-sip/src/test/java/cn/skcks/docking/gb28181/sip/manscdp/MANSCDPTest.java
View File

@ -1,16 +1,18 @@
package cn.skcks.docking.gb28181.sip.manscdp; package cn.skcks.docking.gb28181.sip.manscdp;
import cn.skcks.docking.gb28181.sip.manscdp.catalog.CatalogDeviceListDTO; import cn.skcks.docking.gb28181.sip.manscdp.catalog.query.CatalogDeviceListDTO;
import cn.skcks.docking.gb28181.sip.manscdp.catalog.CatalogItemDTO; import cn.skcks.docking.gb28181.sip.manscdp.catalog.query.CatalogItemDTO;
import cn.skcks.docking.gb28181.sip.manscdp.catalog.CatalogQueryDTO; import cn.skcks.docking.gb28181.sip.manscdp.catalog.query.CatalogQueryDTO;
import cn.skcks.docking.gb28181.sip.manscdp.catalog.CatalogResponseDTO; import cn.skcks.docking.gb28181.sip.manscdp.catalog.response.CatalogResponseDTO;
import cn.skcks.docking.gb28181.sip.manscdp.keepalive.KeepaliveNotifyDTO; import cn.skcks.docking.gb28181.sip.manscdp.keepalive.KeepaliveNotifyDTO;
import cn.skcks.docking.gb28181.sip.utils.MANSCDPUtils; import cn.skcks.docking.gb28181.sip.utils.MANSCDPUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List;
@Slf4j @Slf4j
public class MANSCDPTest { public class MANSCDPTest {
@ -56,10 +58,14 @@ public class MANSCDPTest {
.name(deviceName) .name(deviceName)
.manufacturer("gb28181-docking-platform") .manufacturer("gb28181-docking-platform")
.build(); .build();
List<CatalogItemDTO> itemDTOList = new ArrayList<>(2);
itemDTOList.add(catalogItemDTO);
itemDTOList.add(catalogItemDTO);
CatalogResponseDTO catalogResponseDTO = CatalogResponseDTO.builder() CatalogResponseDTO catalogResponseDTO = CatalogResponseDTO.builder()
.deviceId(deviceId) .deviceId(deviceId)
.sn(sn) .sn(sn)
.deviceList(new CatalogDeviceListDTO(1,Collections.singletonList(catalogItemDTO))) .deviceList(new CatalogDeviceListDTO(itemDTOList.size(), itemDTOList))
.sumNum(0L) .sumNum(0L)
.build(); .build();
// 默认 GB2312 编码 // 默认 GB2312 编码