guzijian / wvp-GB28181-pro · Commits

Commit a77ba194ad305feb66a3697f8696a918a3860193

Authored by 648540858
1 parent 2142b7ff

优化目录推送CivilCode值

Inline Side-by-side
Showing 4 changed files with 6 additions and 6 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
  View file @a77ba19
@@ -86,7 +86,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple @@ -86,7 +86,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple
86 deviceChannel.setParental(1); 86 deviceChannel.setParental(1);
87 deviceChannel.setParentId(catalog.getParentId()); 87 deviceChannel.setParentId(catalog.getParentId());
88 deviceChannel.setRegisterWay(1); 88 deviceChannel.setRegisterWay(1);
89 - deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2)); 89 + deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
90 deviceChannel.setModel("live"); 90 deviceChannel.setModel("live");
91 deviceChannel.setOwner("wvp-pro"); 91 deviceChannel.setOwner("wvp-pro");
92 deviceChannel.setSecrecy("0"); 92 deviceChannel.setSecrecy("0");
@@ -125,7 +125,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple @@ -125,7 +125,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple
125 deviceChannel.setStatus(gbStream.isStatus()?1:0); 125 deviceChannel.setStatus(gbStream.isStatus()?1:0);
126 deviceChannel.setParentId(gbStream.getCatalogId()); 126 deviceChannel.setParentId(gbStream.getCatalogId());
127 deviceChannel.setRegisterWay(1); 127 deviceChannel.setRegisterWay(1);
128 - deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2)); 128 + deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
129 deviceChannel.setModel("live"); 129 deviceChannel.setModel("live");
130 deviceChannel.setOwner("wvp-pro"); 130 deviceChannel.setOwner("wvp-pro");
131 deviceChannel.setParental(0); 131 deviceChannel.setParental(0);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
  View file @a77ba19
@@ -89,7 +89,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem @@ -89,7 +89,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem
89 deviceChannel.setParental(1); 89 deviceChannel.setParental(1);
90 deviceChannel.setParentId(catalog.getParentId()); 90 deviceChannel.setParentId(catalog.getParentId());
91 deviceChannel.setRegisterWay(1); 91 deviceChannel.setRegisterWay(1);
92 - deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2)); 92 + deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
93 deviceChannel.setModel("live"); 93 deviceChannel.setModel("live");
94 deviceChannel.setOwner("wvp-pro"); 94 deviceChannel.setOwner("wvp-pro");
95 deviceChannel.setSecrecy("0"); 95 deviceChannel.setSecrecy("0");
@@ -128,7 +128,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem @@ -128,7 +128,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem
128 deviceChannel.setStatus(gbStream.isStatus()?1:0); 128 deviceChannel.setStatus(gbStream.isStatus()?1:0);
129 deviceChannel.setParentId(gbStream.getCatalogId()); 129 deviceChannel.setParentId(gbStream.getCatalogId());
130 deviceChannel.setRegisterWay(1); 130 deviceChannel.setRegisterWay(1);
131 - deviceChannel.setCivilCode(config.getDomain().substring(0, config.getDomain().length() - 2)); 131 + deviceChannel.setCivilCode(parentPlatform.getDeviceGBId().substring(0,6));
132 deviceChannel.setModel("live"); 132 deviceChannel.setModel("live");
133 deviceChannel.setOwner("wvp-pro"); 133 deviceChannel.setOwner("wvp-pro");
134 deviceChannel.setParental(0); 134 deviceChannel.setParental(0);
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
  View file @a77ba19
@@ -103,7 +103,7 @@ public class GbStreamServiceImpl implements IGbStreamService { @@ -103,7 +103,7 @@ public class GbStreamServiceImpl implements IGbStreamService {
103 deviceChannel.setStatus(gbStream.isStatus()?1:0); 103 deviceChannel.setStatus(gbStream.isStatus()?1:0);
104 deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId); 104 deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId);
105 deviceChannel.setRegisterWay(1); 105 deviceChannel.setRegisterWay(1);
106 - deviceChannel.setCivilCode(sipConfig.getDomain().substring(0, sipConfig.getDomain().length() - 2)); 106 + deviceChannel.setCivilCode(deviceGBId.substring(0, 6));
107 deviceChannel.setModel("live"); 107 deviceChannel.setModel("live");
108 deviceChannel.setOwner("wvp-pro"); 108 deviceChannel.setOwner("wvp-pro");
109 deviceChannel.setParental(0); 109 deviceChannel.setParental(0);
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @a77ba19
@@ -1083,7 +1083,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager { @@ -1083,7 +1083,7 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
1083 deviceChannel.setParentId(catalog.getParentId()); 1083 deviceChannel.setParentId(catalog.getParentId());
1084 deviceChannel.setRegisterWay(1); 1084 deviceChannel.setRegisterWay(1);
1085 // 行政区划应该是Domain的前八位 1085 // 行政区划应该是Domain的前八位
1086 - deviceChannel.setCivilCode(sipConfig.getDomain().substring(0, sipConfig.getDomain().length() - 2)); 1086 + deviceChannel.setCivilCode(parentPlatByServerGBId.getDeviceGBId().substring(0,6));
1087 deviceChannel.setModel("live"); 1087 deviceChannel.setModel("live");
1088 deviceChannel.setOwner("wvp-pro"); 1088 deviceChannel.setOwner("wvp-pro");
1089 deviceChannel.setSecrecy("0"); 1089 deviceChannel.setSecrecy("0");