From ecaf8750dd9c537e581ae05c65be9a26db5e67a7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 24 Nov 2020 16:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=91=E4=B8=8A=E7=BA=A7?= =?UTF-8?q?=E8=81=94->=E6=B3=A8=E5=86=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- .../genersoft/iot/vmp/gb28181/SipLayer.java | 2 +- .../iot/vmp/gb28181/event/EventPublisher.java | 13 +++ .../PlatformNotRegisterEvent.java | 21 +++++ .../PlatformNotRegisterEventLister.java | 45 ++++++++++ .../gb28181/transmit/SIPProcessorFactory.java | 10 ++- .../gb28181/transmit/cmd/ISIPCommander.java | 3 + .../cmd/ISIPCommanderForPlatform.java | 13 +++ .../cmd/SIPRequestHeaderProvider.java | 72 ++++++++++++++++ .../cmd/impl/SIPCommanderFroPlatform.java | 81 ++++++++++++++++++ .../impl/RegisterResponseProcessor.java | 83 +++++++++++++++++++ .../vmp/storager/IVideoManagerStorager.java | 7 ++ .../jdbc/VideoManagerJdbcStoragerImpl.java | 5 ++ .../redis/VideoManagerRedisStoragerImpl.java | 6 ++ .../vmanager/platform/PlatformController.java | 23 +++++ web_src/src/components/platformEdit.vue | 42 ++++++++-- 16 files changed, 416 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEvent.java create mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java create mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java create mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java create mode 100644 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java diff --git a/README.md b/README.md index 583d34e1..2cca7a5c 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,8 @@ https://gitee.com/18010473990/wvp-GB28181.git # 2.0 支持特性 - [ ] 国标通道向上级联 - [X] WEB添加上级平台 - - [ ] 注册 + - [X] 注册 + - [ ] 心跳保活 - [ ] 通道选择 - [ ] 通道推送 - [ ] 点播 diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java index bfdc8f6c..9b091e69 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java @@ -123,7 +123,7 @@ public class SipLayer implements SipListener { public void processResponse(ResponseEvent evt) { Response response = evt.getResponse(); int status = response.getStatusCode(); - if ((status >= 200) && (status < 300)) { // Success! + if (((status >= 200) && (status < 300)) || status == 401) { // Success! ISIPResponseProcessor processor = processorFactory.createResponseProcessor(evt); try { processor.process(evt, this, sipConfig); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java index ebf04305..3e0a1842 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java @@ -1,5 +1,8 @@ package com.genersoft.iot.vmp.gb28181.event; +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import com.genersoft.iot.vmp.gb28181.event.platformNotRegister.PlatformNotRegisterEvent; +import com.genersoft.iot.vmp.vmanager.platform.PlatformController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Component; @@ -31,4 +34,14 @@ public class EventPublisher { outEvent.setFrom(from); applicationEventPublisher.publishEvent(outEvent); } + + /** + * 平台未注册事件 + * @param platformGbId + */ + public void platformNotRegisterEventPublish(String platformGbId){ + PlatformNotRegisterEvent platformNotRegisterEvent = new PlatformNotRegisterEvent(this); + platformNotRegisterEvent.setPlatformGbID(platformGbId); + applicationEventPublisher.publishEvent(platformNotRegisterEvent); + } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEvent.java new file mode 100644 index 00000000..9c238d7d --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEvent.java @@ -0,0 +1,21 @@ +package com.genersoft.iot.vmp.gb28181.event.platformNotRegister; + +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import org.springframework.context.ApplicationEvent; + +public class PlatformNotRegisterEvent extends ApplicationEvent { + + private String platformGbID; + + public PlatformNotRegisterEvent(Object source) { + super(source); + } + + public String getPlatformGbID() { + return platformGbID; + } + + public void setPlatformGbID(String platformGbID) { + this.platformGbID = platformGbID; + } +} diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java new file mode 100644 index 00000000..564d3821 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/platformNotRegister/PlatformNotRegisterEventLister.java @@ -0,0 +1,45 @@ +package com.genersoft.iot.vmp.gb28181.event.platformNotRegister; + +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import com.genersoft.iot.vmp.gb28181.event.online.OnlineEvent; +import com.genersoft.iot.vmp.gb28181.event.online.OnlineEventListener; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import com.genersoft.iot.vmp.utils.redis.RedisUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.ApplicationEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; + +/** + * @Description: 平台未注册事件,来源有二: + * 1、平台新添加 + * 2、平台心跳超时 + * @author: panll + * @date: 2020年11月24日 10:00 + */ +@Component +public class PlatformNotRegisterEventLister implements ApplicationListener { + + private final static Logger logger = LoggerFactory.getLogger(PlatformNotRegisterEventLister.class); + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + private RedisUtil redis; + + @Override + public void onApplicationEvent(PlatformNotRegisterEvent event) { + + if (logger.isDebugEnabled()) { + logger.debug("平台未注册事件触发，平台国标ID：" + event.getPlatformGbID()); + } + ParentPlatform parentPlatform = storager.queryParentPlatById(event.getPlatformGbID()); + if (parentPlatform == null) { + logger.debug("平台未注册事件触发，但平台已经删除!!! 平台国标ID：" + event.getPlatformGbID()); + return; + } + } +} diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java index 73fb474d..3ee95f90 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java @@ -8,6 +8,7 @@ import javax.sip.message.Request; import javax.sip.message.Response; import com.alibaba.fastjson.JSON; +import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -30,10 +31,6 @@ import com.genersoft.iot.vmp.gb28181.transmit.request.impl.OtherRequestProcessor import com.genersoft.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor; import com.genersoft.iot.vmp.gb28181.transmit.request.impl.SubscribeRequestProcessor; import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor; -import com.genersoft.iot.vmp.gb28181.transmit.response.impl.ByeResponseProcessor; -import com.genersoft.iot.vmp.gb28181.transmit.response.impl.CancelResponseProcessor; -import com.genersoft.iot.vmp.gb28181.transmit.response.impl.InviteResponseProcessor; -import com.genersoft.iot.vmp.gb28181.transmit.response.impl.OtherResponseProcessor; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.utils.SpringBeanFactory; import com.genersoft.iot.vmp.utils.redis.RedisUtil; @@ -80,6 +77,9 @@ public class SIPProcessorFactory { @Autowired private CancelResponseProcessor cancelResponseProcessor; + + @Autowired + private RegisterResponseProcessor registerResponseProcessor; @Autowired private OtherResponseProcessor otherResponseProcessor; @@ -154,6 +154,8 @@ public class SIPProcessorFactory { return byeResponseProcessor; } else if (Request.CANCEL.equals(method)) { return cancelResponseProcessor; + }else if (Request.REGISTER.equals(method)) { + return registerResponseProcessor; } else { return otherResponseProcessor; } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java index 923f211a..32cc06e1 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java @@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.gb28181.transmit.cmd; import com.genersoft.iot.vmp.common.StreamInfo; import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; /** * @Description:设备能力接口，用于定义设备的控制、查询能力 @@ -212,4 +213,6 @@ public interface ISIPCommander { * @param device 视频设备 */ public boolean mobilePostitionQuery(Device device); + + } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java new file mode 100644 index 00000000..9ec2b497 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java @@ -0,0 +1,13 @@ +package com.genersoft.iot.vmp.gb28181.transmit.cmd; + +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; + +public interface ISIPCommanderForPlatform { + + /** + * 向上级平台注册 + * @param parentPlatform + * @return + */ + boolean register(ParentPlatform parentPlatform, String callId, String realm, String nonce, String scheme); +} diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java index 2233ee05..fa3465dd 100644 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java @@ -11,7 +11,9 @@ import javax.sip.address.Address; import javax.sip.address.SipURI; import javax.sip.header.*; import javax.sip.message.Request; +import javax.validation.constraints.NotNull; +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; @@ -19,6 +21,7 @@ import org.springframework.stereotype.Component; import com.genersoft.iot.vmp.conf.SipConfig; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.Host; +import org.springframework.util.DigestUtils; /** * @Description:摄像头命令request创造器 TODO 冗余代码太多待优化 @@ -168,4 +171,73 @@ public class SIPRequestHeaderProvider { request.setContent(content, contentTypeHeader); return request; } + + + public Request createRegisterRequest(@NotNull ParentPlatform platform, String fromTag, String viaTag) throws ParseException, InvalidArgumentException, PeerUnavailableException { + Request request = null; + String sipAddress = sipConfig.getSipIp() + ":" + sipConfig.getSipPort(); + //请求行 + SipURI requestLine = sipFactory.createAddressFactory().createSipURI(platform.getDeviceGBId(), + platform.getServerIP() + ":" + platform.getServerPort()); + //via + ArrayList viaHeaders = new ArrayList(); + ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(platform.getServerIP(), platform.getServerPort(), platform.getTransport(), viaTag); + viaHeader.setRPort(); + viaHeaders.add(viaHeader); + //from + SipURI fromSipURI = sipFactory.createAddressFactory().createSipURI(platform.getDeviceGBId(),sipAddress); + Address fromAddress = sipFactory.createAddressFactory().createAddress(fromSipURI); + FromHeader fromHeader = sipFactory.createHeaderFactory().createFromHeader(fromAddress, fromTag); + //to + SipURI toSipURI = sipFactory.createAddressFactory().createSipURI(platform.getDeviceGBId(),sipAddress); + Address toAddress = sipFactory.createAddressFactory().createAddress(toSipURI); + ToHeader toHeader = sipFactory.createHeaderFactory().createToHeader(toAddress,null); + + //callid + CallIdHeader callIdHeader = null; + if(platform.getTransport().equals("TCP")) { + callIdHeader = tcpSipProvider.getNewCallId(); + } + if(platform.getTransport().equals("UDP")) { + callIdHeader = udpSipProvider.getNewCallId(); + } + + //Forwards + MaxForwardsHeader maxForwards = sipFactory.createHeaderFactory().createMaxForwardsHeader(70); + + //ceq + CSeqHeader cSeqHeader = sipFactory.createHeaderFactory().createCSeqHeader(1L, Request.REGISTER); + request = sipFactory.createMessageFactory().createRequest(requestLine, Request.REGISTER, callIdHeader, + cSeqHeader,fromHeader, toHeader, viaHeaders, maxForwards); + + Address concatAddress = sipFactory.createAddressFactory().createAddress(sipFactory.createAddressFactory() + .createSipURI(platform.getDeviceGBId(), sipAddress)); + request.addHeader(sipFactory.createHeaderFactory().createContactHeader(concatAddress)); + + return request; + } + + public Request createRegisterRequest(@NotNull ParentPlatform parentPlatform, String fromTag, String viaTag, + String callId, String realm, String nonce, String scheme) throws ParseException, PeerUnavailableException, InvalidArgumentException { + Request registerRequest = createRegisterRequest(parentPlatform, fromTag, viaTag); + + CallIdHeader callIdHeader = (CallIdHeader)registerRequest.getHeader(CallIdHeader.NAME); + callIdHeader.setCallId(callId); + + String uri = "sip:" + parentPlatform.getServerGBId() + + "@" + parentPlatform.getServerIP() + + ":" + parentPlatform.getServerPort(); + + String HA1 = DigestUtils.md5DigestAsHex((parentPlatform.getDeviceGBId() + ":" + realm + ":" + parentPlatform.getPassword()).getBytes()); + String HA2=DigestUtils.md5DigestAsHex((Request.REGISTER + ":" + uri).getBytes()); + String RESPONSE = DigestUtils.md5DigestAsHex((HA1 + ":" + nonce + ":" + HA2).getBytes()); + + String authorizationHeaderContent = scheme + " username=\"" + parentPlatform.getDeviceGBId() + "\", " + "realm=\"" + + realm + "\", uri=\"" + uri + "\", response=\"" + RESPONSE + "\", nonce=\"" + + nonce + "\""; + AuthorizationHeader authorizationHeader = sipFactory.createHeaderFactory().createAuthorizationHeader(authorizationHeaderContent); + registerRequest.addHeader(authorizationHeader); + + return registerRequest; + } } diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java new file mode 100644 index 00000000..baf6e5ac --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java @@ -0,0 +1,81 @@ +package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl; + +import com.genersoft.iot.vmp.conf.SipConfig; +import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider; +import com.genersoft.iot.vmp.media.zlm.ZLMUtils; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.lang.Nullable; +import org.springframework.stereotype.Component; + +import javax.sip.*; +import javax.sip.message.Request; +import java.text.ParseException; + +@Component +public class SIPCommanderFroPlatform implements ISIPCommanderForPlatform { + + @Autowired + private SipConfig sipConfig; + + @Autowired + private SIPRequestHeaderProvider headerProvider; + + @Autowired + private VideoStreamSessionManager streamSession; + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + @Qualifier(value="tcpSipProvider") + private SipProvider tcpSipProvider; + + @Autowired + @Qualifier(value="udpSipProvider") + private SipProvider udpSipProvider; + + @Autowired + private ZLMUtils zlmUtils; + + @Value("${media.rtp.enable}") + private boolean rtpEnable; + + @Override + public boolean register(ParentPlatform parentPlatform, @Nullable String callId, @Nullable String realm, @Nullable String nonce, @Nullable String scheme ) { + try { + Request request = null; + if (realm == null || nonce == null) { + request = headerProvider.createRegisterRequest(parentPlatform, null, null); + }else { + request = headerProvider.createRegisterRequest(parentPlatform, null, null, callId, realm, nonce, scheme); + } + + transmitRequest(parentPlatform, request); + return true; + } catch (ParseException e) { + e.printStackTrace(); + } catch (InvalidArgumentException e) { + e.printStackTrace(); + } catch (PeerUnavailableException e) { + e.printStackTrace(); + } catch (SipException e) { + e.printStackTrace(); + } + return false; + } + + private void transmitRequest(ParentPlatform parentPlatform, Request request) throws SipException { + if("TCP".equals(parentPlatform.getTransport())) { + tcpSipProvider.sendRequest(request); + } else if("UDP".equals(parentPlatform.getTransport())) { + udpSipProvider.sendRequest(request); + } + } +} diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java new file mode 100644 index 00000000..9fb13129 --- /dev/null +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java @@ -0,0 +1,83 @@ +package com.genersoft.iot.vmp.gb28181.transmit.response.impl; + +import com.genersoft.iot.vmp.conf.SipConfig; +import com.genersoft.iot.vmp.gb28181.SipLayer; +import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; +import com.genersoft.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor; +import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import gov.nist.core.Host; +import gov.nist.javax.sip.address.AddressImpl; +import gov.nist.javax.sip.address.SipUri; +import gov.nist.javax.sip.header.To; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.sip.ResponseEvent; +import javax.sip.address.Address; +import javax.sip.address.URI; +import javax.sip.header.CallIdHeader; +import javax.sip.header.ToHeader; +import javax.sip.header.WWWAuthenticateHeader; +import javax.sip.message.Response; + +/** + * @Description:Register响应处理器 + * @author: swwheihei + * @date: 2020年5月3日 下午5:32:23 + */ +@Component +public class RegisterResponseProcessor implements ISIPResponseProcessor { + + private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class); + + @Autowired + private ISIPCommanderForPlatform sipCommanderForPlatform; + + @Autowired + private IVideoManagerStorager storager; + + /** + * 处理Register响应 + * + * @param evt + * @param layer + * @param config + */ + @Override + public void process(ResponseEvent evt, SipLayer layer, SipConfig config) { + // TODO Auto-generated method stub + Response response = evt.getResponse(); + ToHeader toHeader = (ToHeader) response.getHeader(ToHeader.NAME); + SipUri uri = (SipUri)toHeader.getAddress().getURI(); + String platformGBId = uri.getAuthority().getUser(); + logger.info(String.format("收到 %s 的注册%S请求", platformGBId, response.getStatusCode() )); + + ParentPlatform parentPlatform = storager.queryParentPlatById(platformGBId); + if (parentPlatform == null) { + logger.warn(String.format("收到 %s 的注册%S请求, 但是平台信息未查询到!!!", platformGBId, response.getStatusCode())); + return; + } + + if (response.getStatusCode() == 401) { + + WWWAuthenticateHeader www = (WWWAuthenticateHeader)response.getHeader(WWWAuthenticateHeader.NAME); + String realm = www.getRealm(); + String nonce = www.getNonce(); + String scheme = www.getScheme(); + + CallIdHeader callIdHeader = (CallIdHeader)response.getHeader(CallIdHeader.NAME); + String callId = callIdHeader.getCallId(); + sipCommanderForPlatform.register(parentPlatform, callId, realm, nonce, scheme); + }else if (response.getStatusCode() == 200){ + // 注册成功 + logger.info(String.format("%s 注册成功", platformGBId )); + parentPlatform.setStatus(true); + storager.updateParentPlatform(parentPlatform); + } + } + +} diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java index 8842230a..b58caae3 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java @@ -213,4 +213,11 @@ public interface IVideoManagerStorager { * @return */ public PageResult queryParentPlatformList(int page, int count); + + /** + * 获取上级平台 + * @param platformGbId + * @return + */ + public ParentPlatform queryParentPlatById(String platformGbId); } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java index 645c8034..5e8ba1a8 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java @@ -229,4 +229,9 @@ public class VideoManagerJdbcStoragerImpl implements IVideoManagerStorager { public PageResult queryParentPlatformList(int page, int count) { return null; } + + @Override + public ParentPlatform queryParentPlatById(String platformGbId) { + return null; + } } diff --git a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java index 0e21167f..ad77995a 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java @@ -561,6 +561,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager { @Override public boolean updateParentPlatform(ParentPlatform parentPlatform) { + // 存储device return redis.set(VideoManagerConstants.PLATFORM_PREFIX + parentPlatform.getDeviceGBId(), parentPlatform); } @@ -587,4 +588,9 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager { pageResult.setData(resultData); return pageResult; } + + @Override + public ParentPlatform queryParentPlatById(String platformGbId) { + return (ParentPlatform)redis.get(VideoManagerConstants.PLATFORM_PREFIX + platformGbId); + } } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java index 27dbdd44..8af7cbfe 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/platform/PlatformController.java @@ -3,6 +3,8 @@ package com.genersoft.iot.vmp.vmanager.platform; import com.genersoft.iot.vmp.common.PageResult; import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.vmanager.device.DeviceController; import org.slf4j.Logger; @@ -24,6 +26,9 @@ public class PlatformController { @Autowired private IVideoManagerStorager storager; + @Autowired + private ISIPCommanderForPlatform commanderForPlatform; + @GetMapping("/platforms/{count}/{page}") public PageResult platforms(@PathVariable int page, @PathVariable int count){ @@ -53,8 +58,13 @@ public class PlatformController { ){ return new ResponseEntity<>("missing parameters", HttpStatus.BAD_REQUEST); } + // TODO 检查是否已经存在,且注册成功, 如果注册成功,需要先注销之前再,修改并注册 + boolean updateResult = storager.updateParentPlatform(parentPlatform); + if (updateResult) { + commanderForPlatform.register(parentPlatform, null, null, null, null); + return new ResponseEntity<>("success", HttpStatus.OK); }else { return new ResponseEntity<>("fail", HttpStatus.OK); @@ -79,4 +89,17 @@ public class PlatformController { return new ResponseEntity<>("fail", HttpStatus.OK); } } + + @RequestMapping("/platforms/exit/{deviceGbId}") + @ResponseBody + public ResponseEntity exitPlatform(@PathVariable String deviceGbId){ + + if (logger.isDebugEnabled()) { + logger.debug("查询所有上级设备API调用"); + } + ParentPlatform parentPlatform = storager.queryParentPlatById(deviceGbId); + return new ResponseEntity<>(String.valueOf(parentPlatform != null), HttpStatus.OK); + } + + } diff --git a/web_src/src/components/platformEdit.vue b/web_src/src/components/platformEdit.vue index faacdde1..7dee4ca4 100644 --- a/web_src/src/components/platformEdit.vue +++ b/web_src/src/components/platformEdit.vue @@ -30,7 +30,7 @@ - + @@ -61,8 +61,8 @@ - - + + {{onSubmit_text}} @@ -81,10 +81,26 @@ export default { name: 'platformEdit', props: {}, computed: { - + }, created() {}, data() { + var deviceGBIdRules = async (rule, value, callback) => { + console.log(value) + if (value === '') { + callback(new Error('请输入设备国标编号')); + } else { + var exit = await this.deviceGBIdExit(value); + console.log(exit) + console.log(exit == "true") + console.log(exit === "true") + if (exit) { + callback(new Error('设备国标编号已存在')); + }else { + callback(); + } + } + }; return { listChangeCallback: null, showDialog: false, @@ -145,7 +161,7 @@ export default { { required: true, message:"请输入SIP服务端口", trigger: 'blur' } ], deviceGBId: [ - { required: true, message:"请输入设备国标编号", trigger: 'blur' } + {validator: deviceGBIdRules, trigger: 'blur' } ], username: [ { required: false, message:"请输入SIP认证用户名", trigger: 'blur' } @@ -176,7 +192,7 @@ export default { this.platform = platform; this.onSubmit_text = "保存" } - + }, onSubmit: function () { console.log('onSubmit'); @@ -206,7 +222,19 @@ export default { this.showDialog = false; this.$refs.platform1.resetFields(); this.$refs.platform2.resetFields(); - + }, + deviceGBIdExit: async function (deviceGbId) { + var result = false; + var that = this + await that.$axios.post(`/api/platforms/exit/${deviceGbId}`) + .then(function (res) { + result = res.data; + }) + .catch(function (error) { + console.log(error); + }); + return result; + } }