roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加行政区划功能，修复目录发送数量统计的BUG

Browse Source
This commit is contained in:
648540858
2022-04-18 17:38:49 +08:00
parent 93d69d5476
commit 91515f1b05
7 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
View File

@@ -524,7 +524,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
parentPlatform.setCatalogGroup(1);
}
if (parentPlatform.getAdministrativeDivision() == null) {
parentPlatform.setAdministrativeDivision(parentPlatform.getDeviceGBId().substring(0,6));
parentPlatform.setAdministrativeDivision(parentPlatform.getAdministrativeDivision());
}
ParentPlatformCatch parentPlatformCatch = redisCatchStorage.queryPlatformCatchInfo(parentPlatform.getServerGBId()); // .getDeviceGBId());
if (parentPlatform.getId() == null ) {
@@ -1081,7 +1081,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
deviceChannel.setParentId(catalog.getParentId());
deviceChannel.setRegisterWay(1);
// 行政区划应该是Domain的前八位
deviceChannel.setCivilCode(parentPlatByServerGBId.getDeviceGBId().substring(0,6));
deviceChannel.setCivilCode(parentPlatByServerGBId.getAdministrativeDivision());
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setSecrecy("0");