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 1 package com.genersoft.iot.vmp.conf;
2 2  
3   -import io.swagger.annotations.ApiOperation;
4 3 import org.springframework.context.annotation.Bean;
5 4 import org.springframework.context.annotation.Configuration;
6 5 import springfox.documentation.builders.ApiInfoBuilder;
7 6 import springfox.documentation.builders.PathSelectors;
8 7 import springfox.documentation.builders.RequestHandlerSelectors;
9   -import springfox.documentation.builders.RequestParameterBuilder;
10   -import springfox.documentation.schema.ScalarType;
11 8 import springfox.documentation.service.ApiInfo;
12 9 import springfox.documentation.service.Contact;
13 10 import springfox.documentation.spi.DocumentationType;
14 11 import springfox.documentation.spring.web.plugins.Docket;
15 12  
16   -import java.util.ArrayList;
17   -import java.util.List;
18   -
19 13 @Configuration
20 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 16 import org.slf4j.LoggerFactory;
17 17 import org.springframework.beans.factory.annotation.Autowired;
18 18 import org.springframework.context.annotation.Bean;
19   -// import org.springframework.context.annotation.ComponentScan;
20 19 import org.springframework.context.annotation.DependsOn;
21 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 12 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
13 13 import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*;
14 14 import com.genersoft.iot.vmp.service.IPlayService;
15   -// import org.slf4j.Logger;
16   -// import org.slf4j.LoggerFactory;
17 15 import org.springframework.beans.factory.annotation.Autowired;
18 16 import org.springframework.context.annotation.Lazy;
19 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 4 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
5 5 import gov.nist.javax.sip.message.MessageFactoryImpl;
6 6 import org.springframework.beans.factory.annotation.Autowired;
7   -// import org.springframework.beans.factory.annotation.Qualifier;
8 7 import org.springframework.stereotype.Component;
9 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 6 import javax.sip.InvalidArgumentException;
7 7 import javax.sip.PeerUnavailableException;
8 8 import javax.sip.SipFactory;
9   -// import javax.sip.SipProvider;
10 9 import javax.sip.address.Address;
11 10 import javax.sip.address.SipURI;
12 11 import javax.sip.header.*;
13 12 import javax.sip.message.Request;
14 13  
15 14 import org.springframework.beans.factory.annotation.Autowired;
16   -// import org.springframework.beans.factory.annotation.Qualifier;
17 15 import org.springframework.stereotype.Component;
18 16  
19 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 23 import org.springframework.beans.factory.annotation.Autowired;
24 24 import org.springframework.beans.factory.annotation.Qualifier;
25 25 import org.springframework.beans.factory.annotation.Value;
26   -// import org.springframework.context.annotation.ComponentScan;
27 26 import org.springframework.context.annotation.DependsOn;
28 27 import org.springframework.context.annotation.Lazy;
29 28 import org.springframework.stereotype.Component;
... ...
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @8b4f709
1 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 3 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
6 4 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
7 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
8 6 import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;
9   -//import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
10 7 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
11 8 import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderPlarformProvider;
12   -//import com.genersoft.iot.vmp.gb28181.transmit.cmd.SIPRequestHeaderProvider;
13 9 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
14   -//import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
15 10 import org.springframework.beans.factory.annotation.Autowired;
16 11 import org.springframework.beans.factory.annotation.Qualifier;
17 12 import org.springframework.beans.factory.annotation.Value;
18   -// import org.springframework.context.annotation.ComponentScan;
19 13 import org.springframework.context.annotation.DependsOn;
20 14 import org.springframework.context.annotation.Lazy;
21 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 178 // 通知下级推流，
179 179 PlayResult playResult = playService.play(device.getDeviceId(), channelId, (responseJSON)->{
180 180 // 收到推流， 回复200OK, 等待ack
181   - if (sendRtpItem == null) return;
  181 + // if (sendRtpItem == null) return;
182 182 sendRtpItem.setStatus(1);
183 183 redisCatchStorage.updateSendRTPSever(sendRtpItem);
184 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 12 import javax.sip.message.Request;
13 13 import javax.sip.message.Response;
14 14  
15   -// import org.slf4j.Logger;
16   -// import org.slf4j.LoggerFactory;
17 15 import org.springframework.stereotype.Component;
18 16  
19 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 2  
3 3 import com.genersoft.iot.vmp.conf.MediaServerConfig;
4 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 5 import org.springframework.beans.factory.annotation.Autowired;
9 6 import org.springframework.beans.factory.annotation.Value;
10 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 97 * @return
98 98 */
99 99 public List<ZLMHttpHookSubscribe.Event> getSubscribes(HookType type) {
100   - ZLMHttpHookSubscribe.Event event= null;
  100 + // ZLMHttpHookSubscribe.Event event= null;
101 101 Map<JSONObject, Event> eventMap = allSubscribes.get(type);
102 102 if (eventMap == null) {
103 103 return null;
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
  View file @8b4f709
1 1 package com.genersoft.iot.vmp.media.zlm;
2 2  
3   -import com.alibaba.fastjson.JSON;
4 3 import com.alibaba.fastjson.JSONObject;
5   -import com.alibaba.fastjson.TypeReference;
6 4 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
7 5 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
8 6 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
9   -import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
10 7 import com.genersoft.iot.vmp.service.IStreamPushService;
11 8 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
12 9 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java
  View file @8b4f709
1 1 package com.genersoft.iot.vmp.media.zlm.dto;
2 2  
3   -import com.alibaba.fastjson.JSONObject;
4   -
5 3 import java.util.List;
6 4  
7 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 87  
88 88 @Override
89 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 93 public static class MediaSchema {
... ...
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
  View file @8b4f709
1 1 package com.genersoft.iot.vmp.service;
2 2  
3 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 1 package com.genersoft.iot.vmp.service;
2 2  
3   -import com.alibaba.fastjson.JSONObject;
4 3 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
5   -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
6 4 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
7 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 3 import com.alibaba.fastjson.JSONObject;
4 4 import com.genersoft.iot.vmp.common.StreamInfo;
5 5 import com.genersoft.iot.vmp.conf.MediaServerConfig;
6   -import com.genersoft.iot.vmp.gb28181.bean.GbStream;
7 6 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
8 7 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
9 8 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
10 9 import com.genersoft.iot.vmp.service.IMediaService;
11   -import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
12 10 import org.springframework.beans.factory.annotation.Autowired;
13 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 6 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
7 7 import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
8 8 import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
9   -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
10 9 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
11 10 import com.genersoft.iot.vmp.service.IStreamPushService;
12 11 import com.genersoft.iot.vmp.storager.dao.GbStreamMapper;
... ...
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
  View file @8b4f709
1 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 3 import com.genersoft.iot.vmp.common.StreamInfo;
6 4 import com.genersoft.iot.vmp.conf.MediaServerConfig;
7 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
8 6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
9 7 import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
10 8  
11   -import java.util.List;
12 9 import java.util.Map;
13 10  
14 11 public interface IRedisCatchStorage {
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
  View file @8b4f709
1 1 package com.genersoft.iot.vmp.storager.dao;
2 2  
3   -import com.genersoft.iot.vmp.gb28181.bean.GbStream;
4 3 import com.genersoft.iot.vmp.gb28181.bean.PlatformGbStream;
5 4 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
6 5 import org.apache.ibatis.annotations.*;
... ...
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
  View file @8b4f709
1 1 package com.genersoft.iot.vmp.storager.dao;
2 2  
3   -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
4 3 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
5 4 import org.apache.ibatis.annotations.*;
6 5 import org.springframework.stereotype.Repository;
... ...
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
  View file @8b4f709
1 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 3 import com.genersoft.iot.vmp.common.StreamInfo;
6 4 import com.genersoft.iot.vmp.common.VideoManagerConstants;
7 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 55 * @param heartBeatCount 心跳计数
56 56 * @return
57 57 */
58   - @ApiOperation("看守位控制命令")
  58 + @ApiOperation("基本配置设置命令")
59 59 @GetMapping("/basicParam/{deviceId}")
60 60 @ApiImplicitParams({
61 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 14 import javax.sip.SipProvider;
15 15 import java.util.Iterator;
16 16  
  17 +@SuppressWarnings("rawtypes")
17 18 @Api(tags = "服务控制")
18 19 @CrossOrigin
19 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 9 import io.swagger.annotations.ApiImplicitParam;
10 10 import io.swagger.annotations.ApiImplicitParams;
11 11 import io.swagger.annotations.ApiOperation;
12   -import io.swagger.models.auth.In;
13 12 import org.slf4j.Logger;
14 13 import org.slf4j.LoggerFactory;
15 14 import org.springframework.beans.factory.annotation.Autowired;
... ...
src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java
  View file @8b4f709
1 1 package com.genersoft.iot.vmp.vmanager.user;
2 2  
3   -import com.genersoft.iot.vmp.gb28181.bean.GbStream;
4 3 import io.swagger.annotations.Api;
5 4 import io.swagger.annotations.ApiImplicitParam;
6 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 4 import com.alibaba.fastjson.JSONObject;
5 5 import com.genersoft.iot.vmp.gb28181.bean.Device;
6 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 7 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
11 8 import com.github.pagehelper.PageInfo;
12 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 6 import com.genersoft.iot.vmp.gb28181.bean.Device;
7 7 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
8 8 import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
9   -// import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
10 9 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
11 10 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
12 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 62 this.isLoging = true;
63 63  
64 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 68 }).then(function (res) {
69 69 console.log(JSON.stringify(res));
70 70 if (res.data == "success") {
... ...
web_src/src/components/ParentPlatformList.vue
  View file @8b4f709
... ... @@ -122,8 +122,8 @@ export default {
122 122 deletePlatformCommit: function(platform) {
123 123 var that = this;
124 124 that.$axios({
125   - method: 'delete',
126   - url:`/api/platform/delete/${platform.serverGBId}`
  125 + method: 'delete',
  126 + url:`/api/platform/delete/${platform.serverGBId}`
127 127 }).then(function (res) {
128 128 if (res.data == "success") {
129 129 that.$message({
... ... @@ -157,8 +157,8 @@ export default {
157 157 let that = this;
158 158  
159 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 162 }).then(function (res) {
163 163 that.total = res.data.total;
164 164 that.platformList = res.data.list;
... ...