From 84b22b197f0c45419fa00577be2f378fa9977903 Mon Sep 17 00:00:00 2001 From: fajiao <1519100073@qq.com> Date: Wed, 25 May 2022 16:45:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BB=8E=20wvp-pro=20=E6=94=B9=E4=B8=BA=20yc?= =?UTF-8?q?IT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java | 2 +- .../message/notify/cmd/CatalogNotifyMessageHandler.java | 8 ++++---- .../message/query/cmd/CatalogQueryMessageHandler.java | 6 +++--- .../iot/vmp/service/impl/GbStreamServiceImpl.java | 4 ++-- .../iot/vmp/storager/impl/VideoManagerStorageImpl.java | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java index f2e524e4..a94d4f81 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java +++ b/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) { List agentParam = new ArrayList<>(); - agentParam.add("wvp-pro"); + agentParam.add("ycIT"); // TODO 添加版本信息以及日期 UserAgentHeader userAgentHeader = null; try { diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java index d714ee4f..5e281adc 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/CatalogNotifyMessageHandler.java +++ b/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.setLatitude(0.0); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); - deviceChannel.setManufacture("wvp-pro"); + deviceChannel.setManufacture("ycIT"); deviceChannel.setStatus(1); deviceChannel.setParental(1); deviceChannel.setParentId(catalog.getParentId()); @@ -86,7 +86,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple } deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision()); deviceChannel.setModel("live"); - deviceChannel.setOwner("wvp-pro"); + deviceChannel.setOwner("ycIT"); deviceChannel.setSecrecy("0"); allChannels.add(deviceChannel); } @@ -121,7 +121,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple deviceChannel.setLongitude(gbStream.getLongitude()); deviceChannel.setLatitude(gbStream.getLatitude()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); - deviceChannel.setManufacture("wvp-pro"); + deviceChannel.setManufacture("ycIT"); // deviceChannel.setStatus(gbStream.isStatus()?1:0); deviceChannel.setStatus(1); deviceChannel.setParentId(gbStream.getCatalogId()); @@ -132,7 +132,7 @@ public class CatalogNotifyMessageHandler extends SIPRequestProcessorParent imple deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision()); } deviceChannel.setModel("live"); - deviceChannel.setOwner("wvp-pro"); + deviceChannel.setOwner("ycIT"); deviceChannel.setParental(0); deviceChannel.setSecrecy("0"); allChannels.add(deviceChannel); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java index 0e979619..4125a5a1 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/CatalogQueryMessageHandler.java +++ b/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.setName(catalog.getName()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); - deviceChannel.setManufacture("wvp-pro"); + deviceChannel.setManufacture("ycIT"); deviceChannel.setStatus(1); deviceChannel.setParental(1); deviceChannel.setParentId(catalog.getParentId()); @@ -134,7 +134,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem deviceChannel.setLongitude(gbStream.getLongitude()); deviceChannel.setLatitude(gbStream.getLatitude()); deviceChannel.setDeviceId(parentPlatform.getDeviceGBId()); - deviceChannel.setManufacture("wvp-pro"); + deviceChannel.setManufacture("ycIT"); // deviceChannel.setStatus(gbStream.isStatus()?1:0); deviceChannel.setStatus(1); deviceChannel.setParentId(gbStream.getCatalogId()); @@ -145,7 +145,7 @@ public class CatalogQueryMessageHandler extends SIPRequestProcessorParent implem deviceChannel.setCivilCode(parentPlatform.getAdministrativeDivision()); } deviceChannel.setModel("live"); - deviceChannel.setOwner("wvp-pro"); + deviceChannel.setOwner("ycIT"); deviceChannel.setParental(0); deviceChannel.setSecrecy("0"); allChannels.add(deviceChannel); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java index a7a55281..25a75ad4 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java +++ b/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.setLatitude(gbStream.getLatitude()); deviceChannel.setDeviceId(platform.getDeviceGBId()); - deviceChannel.setManufacture("wvp-pro"); + deviceChannel.setManufacture("ycIT"); // deviceChannel.setStatus(gbStream.isStatus()?1:0); deviceChannel.setStatus(1); deviceChannel.setParentId(catalogId ==null?gbStream.getCatalogId():catalogId); @@ -112,7 +112,7 @@ public class GbStreamServiceImpl implements IGbStreamService { deviceChannel.setCivilCode(platform.getAdministrativeDivision()); } deviceChannel.setModel("live"); - deviceChannel.setOwner("wvp-pro"); + deviceChannel.setOwner("ycIT"); deviceChannel.setParental(0); deviceChannel.setSecrecy("0"); return deviceChannel; diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java index 3bb3d9f0..353c5211 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java +++ b/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.setLatitude(0.0); deviceChannel.setDeviceId(parentPlatByServerGBId.getDeviceGBId()); - deviceChannel.setManufacture("wvp-pro"); + deviceChannel.setManufacture("ycIT"); deviceChannel.setStatus(1); deviceChannel.setParental(1); deviceChannel.setParentId(catalog.getParentId()); @@ -1059,7 +1059,7 @@ public class VideoManagerStorageImpl implements IVideoManagerStorage { // 行政区划应该是Domain的前八位 deviceChannel.setCivilCode(parentPlatByServerGBId.getAdministrativeDivision()); deviceChannel.setModel("live"); - deviceChannel.setOwner("wvp-pro"); + deviceChannel.setOwner("ycIT"); deviceChannel.setSecrecy("0"); return deviceChannel; }