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