guzijian / wvp-GB28181-pro · Commits

Commit 8b4f7095e2e850cccd9b7bb00703163c08d31bbe

Authored by lawrencehj
1 parent d27164bf

去除多余引用，修正个别错误

Inline Side-by-side
Showing 30 changed files with 12 additions and 60 deletions
src/main/java/com/genersoft/iot/vmp/conf/Swagger3Config.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import io.swagger.annotations.ApiOperation;  
4 import org.springframework.context.annotation.Bean; 3 import org.springframework.context.annotation.Bean;
5 import org.springframework.context.annotation.Configuration; 4 import org.springframework.context.annotation.Configuration;
6 import springfox.documentation.builders.ApiInfoBuilder; 5 import springfox.documentation.builders.ApiInfoBuilder;
7 import springfox.documentation.builders.PathSelectors; 6 import springfox.documentation.builders.PathSelectors;
8 import springfox.documentation.builders.RequestHandlerSelectors; 7 import springfox.documentation.builders.RequestHandlerSelectors;
9 -import springfox.documentation.builders.RequestParameterBuilder;  
10 -import springfox.documentation.schema.ScalarType;  
11 import springfox.documentation.service.ApiInfo; 8 import springfox.documentation.service.ApiInfo;
12 import springfox.documentation.service.Contact; 9 import springfox.documentation.service.Contact;
13 import springfox.documentation.spi.DocumentationType; 10 import springfox.documentation.spi.DocumentationType;
14 import springfox.documentation.spring.web.plugins.Docket; 11 import springfox.documentation.spring.web.plugins.Docket;
15 12
16 -import java.util.ArrayList;  
17 -import java.util.List;  
18 -  
19 @Configuration 13 @Configuration
20 public class Swagger3Config { 14 public class Swagger3Config {
21 15
src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
  View file @8b4f709
@@ -16,7 +16,6 @@ import org.slf4j.Logger; @@ -16,7 +16,6 @@ import org.slf4j.Logger;
16 import org.slf4j.LoggerFactory; 16 import org.slf4j.LoggerFactory;
17 import org.springframework.beans.factory.annotation.Autowired; 17 import org.springframework.beans.factory.annotation.Autowired;
18 import org.springframework.context.annotation.Bean; 18 import org.springframework.context.annotation.Bean;
19 -// import org.springframework.context.annotation.ComponentScan;  
20 import org.springframework.context.annotation.DependsOn; 19 import org.springframework.context.annotation.DependsOn;
21 import org.springframework.stereotype.Component; 20 import org.springframework.stereotype.Component;
22 21
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
  View file @8b4f709
@@ -12,8 +12,6 @@ import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; @@ -12,8 +12,6 @@ import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
12 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 12 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
13 import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*; 13 import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*;
14 import com.genersoft.iot.vmp.service.IPlayService; 14 import com.genersoft.iot.vmp.service.IPlayService;
15 -// import org.slf4j.Logger;  
16 -// import org.slf4j.LoggerFactory;  
17 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
18 import org.springframework.context.annotation.Lazy; 16 import org.springframework.context.annotation.Lazy;
19 import org.springframework.stereotype.Component; 17 import org.springframework.stereotype.Component;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
  View file @8b4f709
@@ -4,7 +4,6 @@ import com.genersoft.iot.vmp.conf.SipConfig; @@ -4,7 +4,6 @@ import com.genersoft.iot.vmp.conf.SipConfig;
4 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 4 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
5 import gov.nist.javax.sip.message.MessageFactoryImpl; 5 import gov.nist.javax.sip.message.MessageFactoryImpl;
6 import org.springframework.beans.factory.annotation.Autowired; 6 import org.springframework.beans.factory.annotation.Autowired;
7 -// import org.springframework.beans.factory.annotation.Qualifier;  
8 import org.springframework.stereotype.Component; 7 import org.springframework.stereotype.Component;
9 import org.springframework.util.DigestUtils; 8 import org.springframework.util.DigestUtils;
10 9
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  View file @8b4f709
@@ -6,14 +6,12 @@ import java.util.ArrayList; @@ -6,14 +6,12 @@ import java.util.ArrayList;
6 import javax.sip.InvalidArgumentException; 6 import javax.sip.InvalidArgumentException;
7 import javax.sip.PeerUnavailableException; 7 import javax.sip.PeerUnavailableException;
8 import javax.sip.SipFactory; 8 import javax.sip.SipFactory;
9 -// import javax.sip.SipProvider;  
10 import javax.sip.address.Address; 9 import javax.sip.address.Address;
11 import javax.sip.address.SipURI; 10 import javax.sip.address.SipURI;
12 import javax.sip.header.*; 11 import javax.sip.header.*;
13 import javax.sip.message.Request; 12 import javax.sip.message.Request;
14 13
15 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
16 -// import org.springframework.beans.factory.annotation.Qualifier;  
17 import org.springframework.stereotype.Component; 15 import org.springframework.stereotype.Component;
18 16
19 import com.genersoft.iot.vmp.conf.SipConfig; 17 import com.genersoft.iot.vmp.conf.SipConfig;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
  View file @8b4f709
@@ -23,7 +23,6 @@ import org.slf4j.LoggerFactory; @@ -23,7 +23,6 @@ import org.slf4j.LoggerFactory;
23 import org.springframework.beans.factory.annotation.Autowired; 23 import org.springframework.beans.factory.annotation.Autowired;
24 import org.springframework.beans.factory.annotation.Qualifier; 24 import org.springframework.beans.factory.annotation.Qualifier;
25 import org.springframework.beans.factory.annotation.Value; 25 import org.springframework.beans.factory.annotation.Value;
26 -// import org.springframework.context.annotation.ComponentScan;  
27 import org.springframework.context.annotation.DependsOn; 26 import org.springframework.context.annotation.DependsOn;
28 import org.springframework.context.annotation.Lazy; 27 import org.springframework.context.annotation.Lazy;
29 import org.springframework.stereotype.Component; 28 import org.springframework.stereotype.Component;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.cmd.impl;
2 2
3 -//import com.genersoft.iot.vmp.conf.SipConfig;  
4 -//import com.genersoft.iot.vmp.gb28181.bean.Device;  
5 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; 3 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 4 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
7 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
8 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; 6 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
9 -//import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;  
10 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; 7 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
11 import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderPlarformProvider; 8 import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderPlarformProvider;
12 -//import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;  
13 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 9 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
14 -//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;  
15 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.beans.factory.annotation.Qualifier; 11 import org.springframework.beans.factory.annotation.Qualifier;
17 import org.springframework.beans.factory.annotation.Value; 12 import org.springframework.beans.factory.annotation.Value;
18 -// import org.springframework.context.annotation.ComponentScan;  
19 import org.springframework.context.annotation.DependsOn; 13 import org.springframework.context.annotation.DependsOn;
20 import org.springframework.context.annotation.Lazy; 14 import org.springframework.context.annotation.Lazy;
21 import org.springframework.lang.Nullable; 15 import org.springframework.lang.Nullable;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/InviteRequestProcessor.java
  View file @8b4f709
@@ -178,7 +178,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor { @@ -178,7 +178,7 @@ public class InviteRequestProcessor extends SIPRequestAbstractProcessor {
178 // 通知下级推流， 178 // 通知下级推流，
179 PlayResult playResult = playService.play(device.getDeviceId(), channelId, (responseJSON)->{ 179 PlayResult playResult = playService.play(device.getDeviceId(), channelId, (responseJSON)->{
180 // 收到推流， 回复200OK, 等待ack 180 // 收到推流， 回复200OK, 等待ack
181 - if (sendRtpItem == null) return; 181 + // if (sendRtpItem == null) return;
182 sendRtpItem.setStatus(1); 182 sendRtpItem.setStatus(1);
183 redisCatchStorage.updateSendRTPSever(sendRtpItem); 183 redisCatchStorage.updateSendRTPSever(sendRtpItem);
184 // TODO 添加对tcp的支持 184 // TODO 添加对tcp的支持
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
  View file @8b4f709
@@ -12,8 +12,6 @@ import javax.sip.header.ViaHeader; @@ -12,8 +12,6 @@ import javax.sip.header.ViaHeader;
12 import javax.sip.message.Request; 12 import javax.sip.message.Request;
13 import javax.sip.message.Response; 13 import javax.sip.message.Response;
14 14
15 -// import org.slf4j.Logger;  
16 -// import org.slf4j.LoggerFactory;  
17 import org.springframework.stereotype.Component; 15 import org.springframework.stereotype.Component;
18 16
19 import com.genersoft.iot.vmp.conf.SipConfig; 17 import com.genersoft.iot.vmp.conf.SipConfig;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHTTPProxyController.java
  View file @8b4f709
@@ -2,9 +2,6 @@ package com.genersoft.iot.vmp.media.zlm; @@ -2,9 +2,6 @@ package com.genersoft.iot.vmp.media.zlm;
2 2
3 import com.genersoft.iot.vmp.conf.MediaServerConfig; 3 import com.genersoft.iot.vmp.conf.MediaServerConfig;
4 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 4 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
5 -// import com.genersoft.iot.vmp.storager.IVideoManagerStorager;  
6 -// import org.slf4j.Logger;  
7 -// import org.slf4j.LoggerFactory;  
8 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
9 import org.springframework.beans.factory.annotation.Value; 6 import org.springframework.beans.factory.annotation.Value;
10 import org.springframework.web.bind.annotation.*; 7 import org.springframework.web.bind.annotation.*;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
  View file @8b4f709
@@ -97,7 +97,7 @@ public class ZLMHttpHookSubscribe { @@ -97,7 +97,7 @@ public class ZLMHttpHookSubscribe {
97 * @return 97 * @return
98 */ 98 */
99 public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) { 99 public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) {
100 - ZLMHttpHookSubscribe.Event event= null; 100 + // ZLMHttpHookSubscribe.Event event= null;
101 Map<JSONObject, Event> eventMap = allSubscribes.get(type); 101 Map<JSONObject, Event> eventMap = allSubscribes.get(type);
102 if (eventMap == null) { 102 if (eventMap == null) {
103 return null; 103 return null;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.JSON;  
4 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
5 -import com.alibaba.fastjson.TypeReference;  
6 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; 4 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
7 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; 5 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
8 import com.genersoft.iot.vmp.gb28181.bean.GbStream; 6 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
9 -import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;  
10 import com.genersoft.iot.vmp.service.IStreamPushService; 7 import com.genersoft.iot.vmp.service.IStreamPushService;
11 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 8 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
12 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 9 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.media.zlm.dto; 1 package com.genersoft.iot.vmp.media.zlm.dto;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 -  
5 import java.util.List; 3 import java.util.List;
6 4
7 public class MediaItem { 5 public class MediaItem {
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
  View file @8b4f709
@@ -87,7 +87,7 @@ public class StreamPushItem extends GbStream implements Comparable&lt;StreamPushIte @@ -87,7 +87,7 @@ public class StreamPushItem extends GbStream implements Comparable&lt;StreamPushIte
87 87
88 @Override 88 @Override
89 public int compareTo(@NotNull StreamPushItem streamPushItem) { 89 public int compareTo(@NotNull StreamPushItem streamPushItem) {
90 - return new Long(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue(); 90 + return Long.valueOf(this.createStamp - streamPushItem.getCreateStamp().intValue()).intValue();
91 } 91 }
92 92
93 public static class MediaSchema { 93 public static class MediaSchema {
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 import com.genersoft.iot.vmp.common.StreamInfo; 3 import com.genersoft.iot.vmp.common.StreamInfo;
4 -import com.genersoft.iot.vmp.gb28181.bean.GbStream;  
5 -import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;  
6 4
7 /** 5 /**
8 * 媒体信息业务 6 * 媒体信息业务
src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 import com.genersoft.iot.vmp.gb28181.bean.GbStream; 3 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
5 -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;  
6 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; 4 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
7 import com.github.pagehelper.PageInfo; 5 import com.github.pagehelper.PageInfo;
8 6
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
  View file @8b4f709
@@ -3,12 +3,10 @@ package com.genersoft.iot.vmp.service.impl; @@ -3,12 +3,10 @@ package com.genersoft.iot.vmp.service.impl;
3 import com.alibaba.fastjson.JSONObject; 3 import com.alibaba.fastjson.JSONObject;
4 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 import com.genersoft.iot.vmp.conf.MediaServerConfig; 5 import com.genersoft.iot.vmp.conf.MediaServerConfig;
6 -import com.genersoft.iot.vmp.gb28181.bean.GbStream;  
7 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; 6 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
8 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 7 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
9 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 8 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
10 import com.genersoft.iot.vmp.service.IMediaService; 9 import com.genersoft.iot.vmp.service.IMediaService;
11 -import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;  
12 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
13 import org.springframework.stereotype.Service; 11 import org.springframework.stereotype.Service;
14 12
src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java
  View file @8b4f709
@@ -6,7 +6,6 @@ import com.alibaba.fastjson.TypeReference; @@ -6,7 +6,6 @@ import com.alibaba.fastjson.TypeReference;
6 import com.genersoft.iot.vmp.gb28181.bean.GbStream; 6 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
7 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils; 7 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
8 import com.genersoft.iot.vmp.media.zlm.dto.MediaItem; 8 import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
9 -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;  
10 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; 9 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
11 import com.genersoft.iot.vmp.service.IStreamPushService; 10 import com.genersoft.iot.vmp.service.IStreamPushService;
12 import com.genersoft.iot.vmp.storager.dao.GbStreamMapper; 11 import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.storager; 1 package com.genersoft.iot.vmp.storager;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 -import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;  
5 import com.genersoft.iot.vmp.common.StreamInfo; 3 import com.genersoft.iot.vmp.common.StreamInfo;
6 import com.genersoft.iot.vmp.conf.MediaServerConfig; 4 import com.genersoft.iot.vmp.conf.MediaServerConfig;
7 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
8 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch; 6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
9 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem; 7 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
10 8
11 -import java.util.List;  
12 import java.util.Map; 9 import java.util.Map;
13 10
14 public interface IRedisCatchStorage { 11 public interface IRedisCatchStorage {
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.storager.dao; 1 package com.genersoft.iot.vmp.storager.dao;
2 2
3 -import com.genersoft.iot.vmp.gb28181.bean.GbStream;  
4 import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream; 3 import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
5 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; 4 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
6 import org.apache.ibatis.annotations.*; 5 import org.apache.ibatis.annotations.*;
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.storager.dao; 1 package com.genersoft.iot.vmp.storager.dao;
2 2
3 -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;  
4 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem; 3 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
5 import org.apache.ibatis.annotations.*; 4 import org.apache.ibatis.annotations.*;
6 import org.springframework.stereotype.Repository; 5 import org.springframework.stereotype.Repository;
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.storager.impl; 1 package com.genersoft.iot.vmp.storager.impl;
2 2
3 -import com.alibaba.fastjson.JSONObject;  
4 -import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;  
5 import com.genersoft.iot.vmp.common.StreamInfo; 3 import com.genersoft.iot.vmp.common.StreamInfo;
6 import com.genersoft.iot.vmp.common.VideoManagerConstants; 4 import com.genersoft.iot.vmp.common.VideoManagerConstants;
7 import com.genersoft.iot.vmp.conf.MediaServerConfig; 5 import com.genersoft.iot.vmp.conf.MediaServerConfig;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
  View file @8b4f709
@@ -55,7 +55,7 @@ public class DeviceConfig { @@ -55,7 +55,7 @@ public class DeviceConfig {
55 * @param heartBeatCount 心跳计数 55 * @param heartBeatCount 心跳计数
56 * @return 56 * @return
57 */ 57 */
58 - @ApiOperation("看守位控制命令") 58 + @ApiOperation("基本配置设置命令")
59 @GetMapping("/basicParam/{deviceId}") 59 @GetMapping("/basicParam/{deviceId}")
60 @ApiImplicitParams({ 60 @ApiImplicitParams({
61 @ApiImplicitParam(name = "deviceId", value ="设备ID" ,dataTypeClass = String.class), 61 @ApiImplicitParam(name = "deviceId", value ="设备ID" ,dataTypeClass = String.class),
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
  View file @8b4f709
@@ -14,6 +14,7 @@ import javax.sip.ObjectInUseException; @@ -14,6 +14,7 @@ import javax.sip.ObjectInUseException;
14 import javax.sip.SipProvider; 14 import javax.sip.SipProvider;
15 import java.util.Iterator; 15 import java.util.Iterator;
16 16
  17 +@SuppressWarnings("rawtypes")
17 @Api(tags = "服务控制") 18 @Api(tags = "服务控制")
18 @CrossOrigin 19 @CrossOrigin
19 @RestController 20 @RestController
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
  View file @8b4f709
@@ -9,7 +9,6 @@ import io.swagger.annotations.Api; @@ -9,7 +9,6 @@ import io.swagger.annotations.Api;
9 import io.swagger.annotations.ApiImplicitParam; 9 import io.swagger.annotations.ApiImplicitParam;
10 import io.swagger.annotations.ApiImplicitParams; 10 import io.swagger.annotations.ApiImplicitParams;
11 import io.swagger.annotations.ApiOperation; 11 import io.swagger.annotations.ApiOperation;
12 -import io.swagger.models.auth.In;  
13 import org.slf4j.Logger; 12 import org.slf4j.Logger;
14 import org.slf4j.LoggerFactory; 13 import org.slf4j.LoggerFactory;
15 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
  View file @8b4f709
1 package com.genersoft.iot.vmp.vmanager.user; 1 package com.genersoft.iot.vmp.vmanager.user;
2 2
3 -import com.genersoft.iot.vmp.gb28181.bean.GbStream;  
4 import io.swagger.annotations.Api; 3 import io.swagger.annotations.Api;
5 import io.swagger.annotations.ApiImplicitParam; 4 import io.swagger.annotations.ApiImplicitParam;
6 import io.swagger.annotations.ApiImplicitParams; 5 import io.swagger.annotations.ApiImplicitParams;
src/main/java/com/genersoft/iot/vmp/web/ApiDeviceController.java
  View file @8b4f709
@@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSONArray; @@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSONArray;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.genersoft.iot.vmp.gb28181.bean.Device; 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; 6 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
7 -// import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;  
8 -// import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;  
9 -// import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;  
10 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 7 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
11 import com.github.pagehelper.PageInfo; 8 import com.github.pagehelper.PageInfo;
12 import org.slf4j.Logger; 9 import org.slf4j.Logger;
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
  View file @8b4f709
@@ -6,7 +6,6 @@ import com.genersoft.iot.vmp.common.StreamInfo; @@ -6,7 +6,6 @@ import com.genersoft.iot.vmp.common.StreamInfo;
6 import com.genersoft.iot.vmp.gb28181.bean.Device; 6 import com.genersoft.iot.vmp.gb28181.bean.Device;
7 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; 7 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
8 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; 8 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
9 -// import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;  
10 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 9 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
11 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 10 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
12 import com.genersoft.iot.vmp.vmanager.gb28181.play.PlayController; 11 import com.genersoft.iot.vmp.vmanager.gb28181.play.PlayController;
web_src/src/components/Login.vue
  View file @8b4f709
@@ -62,9 +62,9 @@ export default { @@ -62,9 +62,9 @@ export default {
62 this.isLoging = true; 62 this.isLoging = true;
63 63
64 this.$axios({ 64 this.$axios({
65 - method: 'get',  
66 - url:"/api/user/login",  
67 - params: loginParam 65 + method: 'get',
  66 + url:"/api/user/login",
  67 + params: loginParam
68 }).then(function (res) { 68 }).then(function (res) {
69 console.log(JSON.stringify(res)); 69 console.log(JSON.stringify(res));
70 if (res.data == "success") { 70 if (res.data == "success") {
web_src/src/components/ParentPlatformList.vue
  View file @8b4f709
@@ -122,8 +122,8 @@ export default { @@ -122,8 +122,8 @@ export default {
122 deletePlatformCommit: function(platform) { 122 deletePlatformCommit: function(platform) {
123 var that = this; 123 var that = this;
124 that.$axios({ 124 that.$axios({
125 - method: 'delete',  
126 - url:`/api/platform/delete/${platform.serverGBId}` 125 + method: 'delete',
  126 + url:`/api/platform/delete/${platform.serverGBId}`
127 }).then(function (res) { 127 }).then(function (res) {
128 if (res.data == "success") { 128 if (res.data == "success") {
129 that.$message({ 129 that.$message({
@@ -157,8 +157,8 @@ export default { @@ -157,8 +157,8 @@ export default {
157 let that = this; 157 let that = this;
158 158
159 this.$axios({ 159 this.$axios({
160 - method: 'get',  
161 - url:`/api/platform/query/${that.count}/${that.currentPage}` 160 + method: 'get',
  161 + url:`/api/platform/query/${that.count}/${that.currentPage}`
162 }).then(function (res) { 162 }).then(function (res) {
163 that.total = res.data.total; 163 that.total = res.data.total;
164 that.platformList = res.data.list; 164 that.platformList = res.data.list;