Browse Source

refactor: 将平台名字从 wvp-pro 改为 ycIT

wvp-28181-2.0
fajiao 3 years ago
parent
commit
84b22b197f
  1. 2
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  2. 8
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java
  3. 6
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java
  4. 4
      src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java
  5. 4
      src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@ -1659,7 +1659,7 @@ public class SIPCommander implements ISIPCommander {
} }
if (request.getHeader(UserAgentHeader.NAME) == null) { if (request.getHeader(UserAgentHeader.NAME) == null) {
List<String> agentParam = new ArrayList<>(); List<String> agentParam = new ArrayList<>();
agentParam.add("wvp-pro"); agentParam.add("ycIT");
// TODO 添加版本信息以及日期 // TODO 添加版本信息以及日期
UserAgentHeader userAgentHeader = null; UserAgentHeader userAgentHeader = null;
try { try {

8
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java

@ -74,7 +74,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple
deviceChannel.setLongitude(0.0); deviceChannel.setLongitude(0.0);
deviceChannel.setLatitude(0.0); deviceChannel.setLatitude(0.0);
deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro"); deviceChannel.setManufacture("ycIT");
deviceChannel.setStatus(1); deviceChannel.setStatus(1);
deviceChannel.setParental(1); deviceChannel.setParental(1);
deviceChannel.setParentId(catalog.getParentId()); deviceChannel.setParentId(catalog.getParentId());
@ -86,7 +86,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple
} }
deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision()); deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
deviceChannel.setModel("live"); deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro"); deviceChannel.setOwner("ycIT");
deviceChannel.setSecrecy("0"); deviceChannel.setSecrecy("0");
allChannels.add(deviceChannel); allChannels.add(deviceChannel);
} }
@ -121,7 +121,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple
deviceChannel.setLongitude(gbStream.getLongitude()); deviceChannel.setLongitude(gbStream.getLongitude());
deviceChannel.setLatitude(gbStream.getLatitude()); deviceChannel.setLatitude(gbStream.getLatitude());
deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro"); deviceChannel.setManufacture("ycIT");
// deviceChannel.setStatus(gbStream.isStatus()?1:0); // deviceChannel.setStatus(gbStream.isStatus()?1:0);
deviceChannel.setStatus(1); deviceChannel.setStatus(1);
deviceChannel.setParentId(gbStream.getCatalogId()); deviceChannel.setParentId(gbStream.getCatalogId());
@ -132,7 +132,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple
deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision()); deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
} }
deviceChannel.setModel("live"); deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro"); deviceChannel.setOwner("ycIT");
deviceChannel.setParental(0); deviceChannel.setParental(0);
deviceChannel.setSecrecy("0"); deviceChannel.setSecrecy("0");
allChannels.add(deviceChannel); allChannels.add(deviceChannel);

6
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java

@ -88,7 +88,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem
deviceChannel.setChannelId(catalog.getId()); deviceChannel.setChannelId(catalog.getId());
deviceChannel.setName(catalog.getName()); deviceChannel.setName(catalog.getName());
deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro"); deviceChannel.setManufacture("ycIT");
deviceChannel.setStatus(1); deviceChannel.setStatus(1);
deviceChannel.setParental(1); deviceChannel.setParental(1);
deviceChannel.setParentId(catalog.getParentId()); deviceChannel.setParentId(catalog.getParentId());
@ -134,7 +134,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem
deviceChannel.setLongitude(gbStream.getLongitude()); deviceChannel.setLongitude(gbStream.getLongitude());
deviceChannel.setLatitude(gbStream.getLatitude()); deviceChannel.setLatitude(gbStream.getLatitude());
deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro"); deviceChannel.setManufacture("ycIT");
// deviceChannel.setStatus(gbStream.isStatus()?1:0); // deviceChannel.setStatus(gbStream.isStatus()?1:0);
deviceChannel.setStatus(1); deviceChannel.setStatus(1);
deviceChannel.setParentId(gbStream.getCatalogId()); deviceChannel.setParentId(gbStream.getCatalogId());
@ -145,7 +145,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem
deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision()); deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision());
} }
deviceChannel.setModel("live"); deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro"); deviceChannel.setOwner("ycIT");
deviceChannel.setParental(0); deviceChannel.setParental(0);
deviceChannel.setSecrecy("0"); deviceChannel.setSecrecy("0");
allChannels.add(deviceChannel); allChannels.add(deviceChannel);

4
src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java

@ -101,7 +101,7 @@ public class GbStreamServiceImpl implements IGbStreamService {
deviceChannel.setLongitude(gbStream.getLongitude()); deviceChannel.setLongitude(gbStream.getLongitude());
deviceChannel.setLatitude(gbStream.getLatitude()); deviceChannel.setLatitude(gbStream.getLatitude());
deviceChannel.setDeviceId(platform.getDeviceGBId()); deviceChannel.setDeviceId(platform.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro"); deviceChannel.setManufacture("ycIT");
// deviceChannel.setStatus(gbStream.isStatus()?1:0); // deviceChannel.setStatus(gbStream.isStatus()?1:0);
deviceChannel.setStatus(1); deviceChannel.setStatus(1);
deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId); deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId);
@ -112,7 +112,7 @@ public class GbStreamServiceImpl implements IGbStreamService {
deviceChannel.setCivilCode(platform.getAdministrativeDivision()); deviceChannel.setCivilCode(platform.getAdministrativeDivision());
} }
deviceChannel.setModel("live"); deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro"); deviceChannel.setOwner("ycIT");
deviceChannel.setParental(0); deviceChannel.setParental(0);
deviceChannel.setSecrecy("0"); deviceChannel.setSecrecy("0");
return deviceChannel; return deviceChannel;

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

@ -1051,7 +1051,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
deviceChannel.setLongitude(0.0); deviceChannel.setLongitude(0.0);
deviceChannel.setLatitude(0.0); deviceChannel.setLatitude(0.0);
deviceChannel.setDeviceId(parentPlatByServerGBId.getDeviceGBId()); deviceChannel.setDeviceId(parentPlatByServerGBId.getDeviceGBId());
deviceChannel.setManufacture("wvp-pro"); deviceChannel.setManufacture("ycIT");
deviceChannel.setStatus(1); deviceChannel.setStatus(1);
deviceChannel.setParental(1); deviceChannel.setParental(1);
deviceChannel.setParentId(catalog.getParentId()); deviceChannel.setParentId(catalog.getParentId());
@ -1059,7 +1059,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage {
// 行政区划应该是Domain的前八位 // 行政区划应该是Domain的前八位
deviceChannel.setCivilCode(parentPlatByServerGBId.getAdministrativeDivision()); deviceChannel.setCivilCode(parentPlatByServerGBId.getAdministrativeDivision());
deviceChannel.setModel("live"); deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro"); deviceChannel.setOwner("ycIT");
deviceChannel.setSecrecy("0"); deviceChannel.setSecrecy("0");
return deviceChannel; return deviceChannel;
} }

Loading…
Cancel
Save