Commit 99d7bea977f3621fd310b950a36c1b0569cb56b2
1 parent
719585bf
去除多余Import
Showing
15 changed files
with
0 additions
and
21 deletions
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
| 1 | package com.genersoft.iot.vmp.conf; | 1 | package com.genersoft.iot.vmp.conf; |
| 2 | 2 | ||
| 3 | -import com.genersoft.iot.vmp.gb28181.session.SsrcConfig; | ||
| 4 | import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; | 3 | import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; |
| 5 | import org.springframework.beans.factory.annotation.Value; | 4 | import org.springframework.beans.factory.annotation.Value; |
| 6 | import org.springframework.context.annotation.Configuration; | 5 | import org.springframework.context.annotation.Configuration; |
src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
| 1 | package com.genersoft.iot.vmp.conf; | 1 | package com.genersoft.iot.vmp.conf; |
| 2 | 2 | ||
| 3 | -import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; | ||
| 4 | import com.genersoft.iot.vmp.storager.IRedisCatchStorage; | 3 | import com.genersoft.iot.vmp.storager.IRedisCatchStorage; |
| 5 | import org.springframework.beans.factory.annotation.Autowired; | 4 | import org.springframework.beans.factory.annotation.Autowired; |
| 6 | import org.springframework.scheduling.annotation.Scheduled; | 5 | import org.springframework.scheduling.annotation.Scheduled; |
src/main/java/com/genersoft/iot/vmp/gb28181/bean/SsrcTransaction.java
src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
| @@ -2,22 +2,16 @@ package com.genersoft.iot.vmp.gb28181.session; | @@ -2,22 +2,16 @@ package com.genersoft.iot.vmp.gb28181.session; | ||
| 2 | 2 | ||
| 3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
| 4 | import java.util.List; | 4 | import java.util.List; |
| 5 | -import java.util.Map; | ||
| 6 | -import java.util.concurrent.ConcurrentHashMap; | ||
| 7 | 5 | ||
| 8 | import javax.sip.ClientTransaction; | 6 | import javax.sip.ClientTransaction; |
| 9 | import javax.sip.Dialog; | 7 | import javax.sip.Dialog; |
| 10 | -import javax.sip.message.Request; | ||
| 11 | 8 | ||
| 12 | import com.genersoft.iot.vmp.common.VideoManagerConstants; | 9 | import com.genersoft.iot.vmp.common.VideoManagerConstants; |
| 13 | import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction; | 10 | import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction; |
| 14 | -import com.genersoft.iot.vmp.service.IMediaServerService; | ||
| 15 | import com.genersoft.iot.vmp.utils.SerializeUtils; | 11 | import com.genersoft.iot.vmp.utils.SerializeUtils; |
| 16 | -import com.genersoft.iot.vmp.utils.redis.JedisUtil; | ||
| 17 | import com.genersoft.iot.vmp.utils.redis.RedisUtil; | 12 | import com.genersoft.iot.vmp.utils.redis.RedisUtil; |
| 18 | import gov.nist.javax.sip.stack.SIPDialog; | 13 | import gov.nist.javax.sip.stack.SIPDialog; |
| 19 | import org.springframework.beans.factory.annotation.Autowired; | 14 | import org.springframework.beans.factory.annotation.Autowired; |
| 20 | -import org.springframework.data.redis.core.RedisTemplate; | ||
| 21 | import org.springframework.stereotype.Component; | 15 | import org.springframework.stereotype.Component; |
| 22 | 16 | ||
| 23 | /** | 17 | /** |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
| @@ -7,7 +7,6 @@ import javax.sip.header.CSeqHeader; | @@ -7,7 +7,6 @@ import javax.sip.header.CSeqHeader; | ||
| 7 | import javax.sip.message.Request; | 7 | import javax.sip.message.Request; |
| 8 | import javax.sip.message.Response; | 8 | import javax.sip.message.Response; |
| 9 | 9 | ||
| 10 | -import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager; | ||
| 11 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform; | 10 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform; |
| 12 | import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; | 11 | import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory; |
| 13 | import com.genersoft.iot.vmp.service.IMediaServerService; | 12 | import com.genersoft.iot.vmp.service.IMediaServerService; |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
| @@ -24,7 +24,6 @@ import gov.nist.javax.sip.SipProviderImpl; | @@ -24,7 +24,6 @@ import gov.nist.javax.sip.SipProviderImpl; | ||
| 24 | import gov.nist.javax.sip.SipStackImpl; | 24 | import gov.nist.javax.sip.SipStackImpl; |
| 25 | import gov.nist.javax.sip.message.SIPRequest; | 25 | import gov.nist.javax.sip.message.SIPRequest; |
| 26 | import gov.nist.javax.sip.stack.SIPDialog; | 26 | import gov.nist.javax.sip.stack.SIPDialog; |
| 27 | -import gov.nist.javax.sip.stack.SIPTransaction; | ||
| 28 | import org.slf4j.Logger; | 27 | import org.slf4j.Logger; |
| 29 | import org.slf4j.LoggerFactory; | 28 | import org.slf4j.LoggerFactory; |
| 30 | import org.springframework.beans.factory.annotation.Autowired; | 29 | import org.springframework.beans.factory.annotation.Autowired; |
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/response/impl/InviteResponseProcessor.java
| @@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.response.impl; | @@ -3,7 +3,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.response.impl; | ||
| 3 | import java.text.ParseException; | 3 | import java.text.ParseException; |
| 4 | 4 | ||
| 5 | import javax.sip.*; | 5 | import javax.sip.*; |
| 6 | -import javax.sip.address.Address; | ||
| 7 | import javax.sip.address.SipURI; | 6 | import javax.sip.address.SipURI; |
| 8 | import javax.sip.header.CSeqHeader; | 7 | import javax.sip.header.CSeqHeader; |
| 9 | import javax.sip.message.Request; | 8 | import javax.sip.message.Request; |
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
| @@ -16,7 +16,6 @@ import org.springframework.stereotype.Component; | @@ -16,7 +16,6 @@ import org.springframework.stereotype.Component; | ||
| 16 | 16 | ||
| 17 | import java.util.*; | 17 | import java.util.*; |
| 18 | 18 | ||
| 19 | -@SuppressWarnings("unchecked") | ||
| 20 | @Component | 19 | @Component |
| 21 | public class ZLMMediaListManager { | 20 | public class ZLMMediaListManager { |
| 22 | 21 |
src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
| 1 | package com.genersoft.iot.vmp.service; | 1 | package com.genersoft.iot.vmp.service; |
| 2 | 2 | ||
| 3 | -import com.genersoft.iot.vmp.conf.MediaConfig; | ||
| 4 | import com.genersoft.iot.vmp.gb28181.bean.Device; | 3 | import com.genersoft.iot.vmp.gb28181.bean.Device; |
| 5 | import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; | 4 | import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig; |
| 6 | import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; | 5 | import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; |
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
| @@ -26,7 +26,6 @@ import org.springframework.boot.CommandLineRunner; | @@ -26,7 +26,6 @@ import org.springframework.boot.CommandLineRunner; | ||
| 26 | import org.springframework.core.annotation.Order; | 26 | import org.springframework.core.annotation.Order; |
| 27 | import org.springframework.stereotype.Service; | 27 | import org.springframework.stereotype.Service; |
| 28 | 28 | ||
| 29 | -import java.sql.Array; | ||
| 30 | import java.text.SimpleDateFormat; | 29 | import java.text.SimpleDateFormat; |
| 31 | import java.util.*; | 30 | import java.util.*; |
| 32 | 31 |
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
| @@ -34,7 +34,6 @@ import org.springframework.stereotype.Service; | @@ -34,7 +34,6 @@ import org.springframework.stereotype.Service; | ||
| 34 | import org.springframework.util.ResourceUtils; | 34 | import org.springframework.util.ResourceUtils; |
| 35 | import org.springframework.web.context.request.async.DeferredResult; | 35 | import org.springframework.web.context.request.async.DeferredResult; |
| 36 | 36 | ||
| 37 | -import javax.sip.ClientTransaction; | ||
| 38 | import javax.sip.message.Response; | 37 | import javax.sip.message.Response; |
| 39 | import java.io.FileNotFoundException; | 38 | import java.io.FileNotFoundException; |
| 40 | import java.util.UUID; | 39 | import java.util.UUID; |
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceConfig.java
| @@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; | @@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; | ||
| 14 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; | 14 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; |
| 15 | import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; | 15 | import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; |
| 16 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; | 16 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; |
| 17 | -import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; | ||
| 18 | import com.genersoft.iot.vmp.storager.IVideoManagerStorager; | 17 | import com.genersoft.iot.vmp.storager.IVideoManagerStorager; |
| 19 | 18 | ||
| 20 | import io.swagger.annotations.Api; | 19 | import io.swagger.annotations.Api; |
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceControl.java
| @@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; | @@ -14,7 +14,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; | ||
| 14 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; | 14 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; |
| 15 | import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; | 15 | import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; |
| 16 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; | 16 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; |
| 17 | -import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; | ||
| 18 | import com.genersoft.iot.vmp.storager.IVideoManagerStorager; | 17 | import com.genersoft.iot.vmp.storager.IVideoManagerStorager; |
| 19 | 18 | ||
| 20 | import io.swagger.annotations.Api; | 19 | import io.swagger.annotations.Api; |
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
| @@ -37,7 +37,6 @@ import com.genersoft.iot.vmp.storager.IVideoManagerStorager; | @@ -37,7 +37,6 @@ import com.genersoft.iot.vmp.storager.IVideoManagerStorager; | ||
| 37 | import org.springframework.web.context.request.async.DeferredResult; | 37 | import org.springframework.web.context.request.async.DeferredResult; |
| 38 | 38 | ||
| 39 | import java.util.List; | 39 | import java.util.List; |
| 40 | -import java.util.Map; | ||
| 41 | import java.util.UUID; | 40 | import java.util.UUID; |
| 42 | 41 | ||
| 43 | import javax.sip.message.Response; | 42 | import javax.sip.message.Response; |
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/ptz/PtzController.java
| @@ -19,7 +19,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; | @@ -19,7 +19,6 @@ import com.genersoft.iot.vmp.gb28181.bean.Device; | ||
| 19 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; | 19 | import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder; |
| 20 | import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; | 20 | import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage; |
| 21 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; | 21 | import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; |
| 22 | -import com.genersoft.iot.vmp.gb28181.utils.XmlUtil; | ||
| 23 | import com.genersoft.iot.vmp.storager.IVideoManagerStorager; | 22 | import com.genersoft.iot.vmp.storager.IVideoManagerStorager; |
| 24 | 23 | ||
| 25 | @Api(tags = "云台控制") | 24 | @Api(tags = "云台控制") |