guzijian / wvp-GB28181-pro · Commits

Commit f92a5da7c2d7deceaba9b5accdc900977e41564b

Authored by lawrencehj
1 parent 0ef6da13

去除多余引用

Inline Side-by-side
Showing 21 changed files with 2 additions and 31 deletions
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
  View file @f92a5da
@@ -3,7 +3,6 @@ package com.genersoft.iot.vmp; @@ -3,7 +3,6 @@ package com.genersoft.iot.vmp;
3 import java.util.logging.LogManager; 3 import java.util.logging.LogManager;
4 4
5 import org.springframework.boot.SpringApplication; 5 import org.springframework.boot.SpringApplication;
6 -import org.springframework.boot.autoconfigure.EnableAutoConfiguration;  
7 import org.springframework.boot.autoconfigure.SpringBootApplication; 6 import org.springframework.boot.autoconfigure.SpringBootApplication;
8 import org.springframework.context.ConfigurableApplicationContext; 7 import org.springframework.context.ConfigurableApplicationContext;
9 import springfox.documentation.oas.annotations.EnableOpenApi; 8 import springfox.documentation.oas.annotations.EnableOpenApi;
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import io.netty.util.internal.StringUtil;  
4 import org.springframework.beans.factory.annotation.Value; 3 import org.springframework.beans.factory.annotation.Value;
5 import org.springframework.context.annotation.Configuration; 4 import org.springframework.context.annotation.Configuration;
6 import org.springframework.util.StringUtils; 5 import org.springframework.util.StringUtils;
src/main/java/com/genersoft/iot/vmp/conf/SipDeviceRunner.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.conf; 1 package com.genersoft.iot.vmp.conf;
2 2
3 -import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;  
4 -import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;  
5 -import com.genersoft.iot.vmp.gb28181.event.EventPublisher;  
6 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 3 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
7 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 4 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
8 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +7,6 @@ import org.springframework.boot.CommandLineRunner; @@ -10,7 +7,6 @@ import org.springframework.boot.CommandLineRunner;
10 import org.springframework.core.annotation.Order; 7 import org.springframework.core.annotation.Order;
11 import org.springframework.stereotype.Component; 8 import org.springframework.stereotype.Component;
12 9
13 -import java.util.List;  
14 10
15 /** 11 /**
16 * 系统启动时控制设备离线 12 * 系统启动时控制设备离线
src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java
  View file @f92a5da
@@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.conf.security; @@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.conf.security;
2 2
3 import com.genersoft.iot.vmp.conf.UserSetup; 3 import com.genersoft.iot.vmp.conf.UserSetup;
4 import org.springframework.beans.factory.annotation.Autowired; 4 import org.springframework.beans.factory.annotation.Autowired;
5 -import org.springframework.beans.factory.annotation.Value;  
6 import org.springframework.context.annotation.Bean; 5 import org.springframework.context.annotation.Bean;
7 import org.springframework.context.annotation.Configuration; 6 import org.springframework.context.annotation.Configuration;
8 import org.springframework.security.authentication.AuthenticationManager; 7 import org.springframework.security.authentication.AuthenticationManager;
src/main/java/com/genersoft/iot/vmp/gb28181/session/SsrcUtil.java
  View file @f92a5da
@@ -5,7 +5,6 @@ import java.util.List; @@ -5,7 +5,6 @@ import java.util.List;
5 import java.util.Random; 5 import java.util.Random;
6 6
7 import com.genersoft.iot.vmp.conf.SipConfig; 7 import com.genersoft.iot.vmp.conf.SipConfig;
8 -import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;  
9 import com.genersoft.iot.vmp.utils.SpringBeanFactory; 8 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
10 import org.slf4j.Logger; 9 import org.slf4j.Logger;
11 import org.slf4j.LoggerFactory; 10 import org.slf4j.LoggerFactory;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
  View file @f92a5da
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.MediaConfig;  
4 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel; 3 import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 4 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
@@ -12,7 +11,6 @@ import org.slf4j.Logger; @@ -12,7 +11,6 @@ import org.slf4j.Logger;
12 import org.slf4j.LoggerFactory; 11 import org.slf4j.LoggerFactory;
13 import org.springframework.beans.factory.annotation.Autowired; 12 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.beans.factory.annotation.Qualifier; 13 import org.springframework.beans.factory.annotation.Qualifier;
15 -import org.springframework.beans.factory.annotation.Value;  
16 import org.springframework.context.annotation.DependsOn; 14 import org.springframework.context.annotation.DependsOn;
17 import org.springframework.context.annotation.Lazy; 15 import org.springframework.context.annotation.Lazy;
18 import org.springframework.lang.Nullable; 16 import org.springframework.lang.Nullable;
@@ -23,8 +21,6 @@ import javax.sip.header.CallIdHeader; @@ -23,8 +21,6 @@ import javax.sip.header.CallIdHeader;
23 import javax.sip.header.WWWAuthenticateHeader; 21 import javax.sip.header.WWWAuthenticateHeader;
24 import javax.sip.message.Request; 22 import javax.sip.message.Request;
25 import java.text.ParseException; 23 import java.text.ParseException;
26 -import java.util.Timer;  
27 -import java.util.TimerTask;  
28 import java.util.UUID; 24 import java.util.UUID;
29 25
30 @Component 26 @Component
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
  View file @f92a5da
@@ -2,10 +2,7 @@ package com.genersoft.iot.vmp.gb28181.transmit.request.impl; @@ -2,10 +2,7 @@ package com.genersoft.iot.vmp.gb28181.transmit.request.impl;
2 2
3 import java.security.NoSuchAlgorithmException; 3 import java.security.NoSuchAlgorithmException;
4 import java.text.ParseException; 4 import java.text.ParseException;
5 -import java.text.SimpleDateFormat;  
6 -import java.time.LocalDateTime;  
7 import java.util.Calendar; 5 import java.util.Calendar;
8 -import java.util.Date;  
9 import java.util.Locale; 6 import java.util.Locale;
10 7
11 import javax.sip.InvalidArgumentException; 8 import javax.sip.InvalidArgumentException;
@@ -22,7 +19,6 @@ import javax.sip.message.Response; @@ -22,7 +19,6 @@ import javax.sip.message.Response;
22 import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate; 19 import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
23 import gov.nist.javax.sip.RequestEventExt; 20 import gov.nist.javax.sip.RequestEventExt;
24 import gov.nist.javax.sip.header.SIPDateHeader; 21 import gov.nist.javax.sip.header.SIPDateHeader;
25 -import gov.nist.javax.sip.message.SIPRequest;  
26 import org.slf4j.Logger; 22 import org.slf4j.Logger;
27 import org.slf4j.LoggerFactory; 23 import org.slf4j.LoggerFactory;
28 import org.springframework.util.StringUtils; 24 import org.springframework.util.StringUtils;
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/RegisterResponseProcessor.java
  View file @f92a5da
@@ -5,7 +5,6 @@ import com.genersoft.iot.vmp.gb28181.SipLayer; @@ -5,7 +5,6 @@ import com.genersoft.iot.vmp.gb28181.SipLayer;
5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform; 5 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch; 6 import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
7 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform; 7 import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
8 -import com.genersoft.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor;  
9 import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor; 8 import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;
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;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @f92a5da
@@ -15,10 +15,8 @@ import com.genersoft.iot.vmp.service.IPlayService; @@ -15,10 +15,8 @@ import com.genersoft.iot.vmp.service.IPlayService;
15 import org.slf4j.Logger; 15 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.beans.factory.annotation.Value;  
19 import org.springframework.http.HttpStatus; 18 import org.springframework.http.HttpStatus;
20 import org.springframework.http.ResponseEntity; 19 import org.springframework.http.ResponseEntity;
21 -import org.springframework.util.StringUtils;  
22 import org.springframework.web.bind.annotation.PostMapping; 20 import org.springframework.web.bind.annotation.PostMapping;
23 import org.springframework.web.bind.annotation.RequestBody; 21 import org.springframework.web.bind.annotation.RequestBody;
24 import org.springframework.web.bind.annotation.RequestMapping; 22 import org.springframework.web.bind.annotation.RequestMapping;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
  View file @f92a5da
@@ -8,7 +8,6 @@ import com.genersoft.iot.vmp.gb28181.session.SsrcUtil; @@ -8,7 +8,6 @@ import com.genersoft.iot.vmp.gb28181.session.SsrcUtil;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 import org.slf4j.LoggerFactory; 9 import org.slf4j.LoggerFactory;
10 import org.springframework.beans.factory.annotation.Autowired; 10 import org.springframework.beans.factory.annotation.Autowired;
11 -import org.springframework.beans.factory.annotation.Value;  
12 import org.springframework.stereotype.Component; 11 import org.springframework.stereotype.Component;
13 12
14 import java.util.HashMap; 13 import java.util.HashMap;
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 import com.alibaba.fastjson.annotation.JSONField; 3 import com.alibaba.fastjson.annotation.JSONField;
4 -import org.springframework.util.StringUtils;  
5 4
6 public class ZLMServerConfig { 5 public class ZLMServerConfig {
7 6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerManger.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.media.zlm; 1 package com.genersoft.iot.vmp.media.zlm;
2 2
3 -import com.alibaba.fastjson.annotation.JSONField;  
4 import com.genersoft.iot.vmp.conf.MediaConfig; 3 import com.genersoft.iot.vmp.conf.MediaConfig;
5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 4 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
6 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.beans.factory.annotation.Autowired;
src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
  View file @f92a5da
@@ -12,8 +12,6 @@ import org.slf4j.Logger; @@ -12,8 +12,6 @@ import org.slf4j.Logger;
12 import org.slf4j.LoggerFactory; 12 import org.slf4j.LoggerFactory;
13 import org.springframework.stereotype.Service; 13 import org.springframework.stereotype.Service;
14 14
15 -import java.net.URI;  
16 -import java.net.URISyntaxException;  
17 import java.util.ArrayList; 15 import java.util.ArrayList;
18 import java.util.HashMap; 16 import java.util.HashMap;
19 import java.util.List; 17 import java.util.List;
src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.service; 1 package com.genersoft.iot.vmp.service;
2 2
3 import com.alibaba.fastjson.JSONArray; 3 import com.alibaba.fastjson.JSONArray;
4 -import com.alibaba.fastjson.JSONObject;  
5 import com.genersoft.iot.vmp.common.StreamInfo; 4 import com.genersoft.iot.vmp.common.StreamInfo;
6 5
7 /** 6 /**
src/main/java/com/genersoft/iot/vmp/service/impl/RecordInfoServerImpl.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.service.impl; 1 package com.genersoft.iot.vmp.service.impl;
2 2
3 -import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;  
4 import com.genersoft.iot.vmp.service.IRecordInfoServer; 3 import com.genersoft.iot.vmp.service.IRecordInfoServer;
5 import com.genersoft.iot.vmp.storager.dao.RecordInfoDao; 4 import com.genersoft.iot.vmp.storager.dao.RecordInfoDao;
6 import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo; 5 import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
src/main/java/com/genersoft/iot/vmp/storager/dao/RecordInfoDao.java
  View file @f92a5da
1 package com.genersoft.iot.vmp.storager.dao; 1 package com.genersoft.iot.vmp.storager.dao;
2 2
3 import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo; 3 import com.genersoft.iot.vmp.storager.dao.dto.RecordInfo;
4 -import com.genersoft.iot.vmp.storager.dao.dto.User;  
5 import org.apache.ibatis.annotations.Delete; 4 import org.apache.ibatis.annotations.Delete;
6 import org.apache.ibatis.annotations.Insert; 5 import org.apache.ibatis.annotations.Insert;
7 import org.apache.ibatis.annotations.Mapper; 6 import org.apache.ibatis.annotations.Mapper;
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
  View file @f92a5da
@@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.storager.impl; @@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.storager.impl;
3 import java.text.SimpleDateFormat; 3 import java.text.SimpleDateFormat;
4 import java.util.*; 4 import java.util.*;
5 5
6 -import com.genersoft.iot.vmp.common.StreamInfo;  
7 import com.genersoft.iot.vmp.gb28181.bean.*; 6 import com.genersoft.iot.vmp.gb28181.bean.*;
8 import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager; 7 import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
9 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; 8 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
  View file @f92a5da
@@ -19,7 +19,6 @@ import org.slf4j.LoggerFactory; @@ -19,7 +19,6 @@ import org.slf4j.LoggerFactory;
19 import org.springframework.beans.factory.annotation.Autowired; 19 import org.springframework.beans.factory.annotation.Autowired;
20 import org.springframework.http.HttpStatus; 20 import org.springframework.http.HttpStatus;
21 import org.springframework.http.ResponseEntity; 21 import org.springframework.http.ResponseEntity;
22 -import org.springframework.util.ResourceUtils;  
23 import org.springframework.web.bind.annotation.CrossOrigin; 22 import org.springframework.web.bind.annotation.CrossOrigin;
24 import org.springframework.web.bind.annotation.GetMapping; 23 import org.springframework.web.bind.annotation.GetMapping;
25 import org.springframework.web.bind.annotation.PathVariable; 24 import org.springframework.web.bind.annotation.PathVariable;
@@ -32,7 +31,6 @@ import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; @@ -32,7 +31,6 @@ import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
32 import com.genersoft.iot.vmp.storager.IVideoManagerStorager; 31 import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
33 import org.springframework.web.context.request.async.DeferredResult; 32 import org.springframework.web.context.request.async.DeferredResult;
34 33
35 -import java.io.FileNotFoundException;  
36 import java.util.UUID; 34 import java.util.UUID;
37 35
38 import javax.sip.message.Response; 36 import javax.sip.message.Response;
src/main/java/com/genersoft/iot/vmp/vmanager/onvif/ONVIFController.java
  View file @f92a5da
@@ -17,6 +17,7 @@ import org.springframework.web.context.request.async.DeferredResult; @@ -17,6 +17,7 @@ import org.springframework.web.context.request.async.DeferredResult;
17 import java.util.List; 17 import java.util.List;
18 import java.util.UUID; 18 import java.util.UUID;
19 19
  20 +@SuppressWarnings(value = {"rawtypes", "unchecked"})
20 @Api(tags = "onvif设备") 21 @Api(tags = "onvif设备")
21 @CrossOrigin 22 @CrossOrigin
22 @RestController 23 @RestController
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
  View file @f92a5da
@@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.vmanager.server; @@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.vmanager.server;
3 import com.genersoft.iot.vmp.VManageBootstrap; 3 import com.genersoft.iot.vmp.VManageBootstrap;
4 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; 4 import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage; 5 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
6 -import com.genersoft.iot.vmp.storager.impl.RedisCatchStorageImpl;  
7 import com.genersoft.iot.vmp.utils.SpringBeanFactory; 6 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
8 import gov.nist.javax.sip.SipStackImpl; 7 import gov.nist.javax.sip.SipStackImpl;
9 import io.swagger.annotations.Api; 8 import io.swagger.annotations.Api;
src/main/java/com/genersoft/iot/vmp/vmanager/streamProxy/StreamProxyController.java
  View file @f92a5da
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
16 import org.springframework.stereotype.Controller; 16 import org.springframework.stereotype.Controller;
17 import org.springframework.web.bind.annotation.*; 17 import org.springframework.web.bind.annotation.*;
18 18
  19 +@SuppressWarnings("rawtypes")
19 /** 20 /**
20 * 拉流代理接口 21 * 拉流代理接口
21 */ 22 */