Commit e11946320904bae07c582cdb3d30b7477820f37e
1 parent
2c0240e1
去除编译报警
Showing
6 changed files
with
8 additions
and
7 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
| @@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.request.impl; | @@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.request.impl; | ||
| 2 | 2 | ||
| 3 | import java.io.ByteArrayInputStream; | 3 | import java.io.ByteArrayInputStream; |
| 4 | import java.text.ParseException; | 4 | import java.text.ParseException; |
| 5 | -import java.text.SimpleDateFormat; | ||
| 6 | import java.util.*; | 5 | import java.util.*; |
| 7 | 6 | ||
| 8 | import javax.sip.address.SipURI; | 7 | import javax.sip.address.SipURI; |
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
| @@ -17,6 +17,7 @@ import org.springframework.stereotype.Component; | @@ -17,6 +17,7 @@ import org.springframework.stereotype.Component; | ||
| 17 | 17 | ||
| 18 | import java.util.*; | 18 | import java.util.*; |
| 19 | 19 | ||
| 20 | +@SuppressWarnings("unchecked") | ||
| 20 | @Component | 21 | @Component |
| 21 | public class ZLMMediaListManager { | 22 | public class ZLMMediaListManager { |
| 22 | 23 |
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
| @@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSON; | @@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSON; | ||
| 4 | import com.alibaba.fastjson.JSONObject; | 4 | import com.alibaba.fastjson.JSONObject; |
| 5 | import com.genersoft.iot.vmp.conf.MediaConfig; | 5 | import com.genersoft.iot.vmp.conf.MediaConfig; |
| 6 | import okhttp3.*; | 6 | import okhttp3.*; |
| 7 | -import org.checkerframework.checker.units.qual.A; | ||
| 8 | import org.jetbrains.annotations.NotNull; | 7 | import org.jetbrains.annotations.NotNull; |
| 9 | import org.slf4j.Logger; | 8 | import org.slf4j.Logger; |
| 10 | import org.slf4j.LoggerFactory; | 9 | import org.slf4j.LoggerFactory; |
| 11 | import org.springframework.beans.factory.annotation.Autowired; | 10 | import org.springframework.beans.factory.annotation.Autowired; |
| 12 | -import org.springframework.beans.factory.annotation.Value; | ||
| 13 | import org.springframework.stereotype.Component; | 11 | import org.springframework.stereotype.Component; |
| 14 | 12 | ||
| 15 | import java.io.*; | 13 | import java.io.*; |
src/main/java/com/genersoft/iot/vmp/onvif/impl/ONVIFServerIMpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java
| @@ -56,7 +56,7 @@ public class GbStreamController { | @@ -56,7 +56,7 @@ public class GbStreamController { | ||
| 56 | */ | 56 | */ |
| 57 | @ApiOperation("移除国标关联") | 57 | @ApiOperation("移除国标关联") |
| 58 | @ApiImplicitParams({ | 58 | @ApiImplicitParams({ |
| 59 | - @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true , | 59 | + @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true, |
| 60 | dataTypeClass = GbStreamParam.class), | 60 | dataTypeClass = GbStreamParam.class), |
| 61 | }) | 61 | }) |
| 62 | @DeleteMapping(value = "/del") | 62 | @DeleteMapping(value = "/del") |
| @@ -77,7 +77,7 @@ public class GbStreamController { | @@ -77,7 +77,7 @@ public class GbStreamController { | ||
| 77 | */ | 77 | */ |
| 78 | @ApiOperation("保存国标关联") | 78 | @ApiOperation("保存国标关联") |
| 79 | @ApiImplicitParams({ | 79 | @ApiImplicitParams({ |
| 80 | - @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true , dataTypeClass = GbStreamParam.class), | 80 | + @ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true, dataTypeClass = GbStreamParam.class), |
| 81 | }) | 81 | }) |
| 82 | @PostMapping(value = "/add") | 82 | @PostMapping(value = "/add") |
| 83 | @ResponseBody | 83 | @ResponseBody |
src/main/java/com/genersoft/iot/vmp/vmanager/record/RecoderProxyController.java
| @@ -14,6 +14,8 @@ import org.springframework.web.client.RestTemplate; | @@ -14,6 +14,8 @@ import org.springframework.web.client.RestTemplate; | ||
| 14 | 14 | ||
| 15 | import javax.servlet.http.HttpServletRequest; | 15 | import javax.servlet.http.HttpServletRequest; |
| 16 | import javax.servlet.http.HttpServletResponse; | 16 | import javax.servlet.http.HttpServletResponse; |
| 17 | + | ||
| 18 | +import java.io.UnsupportedEncodingException; | ||
| 17 | import java.net.URLDecoder; | 19 | import java.net.URLDecoder; |
| 18 | 20 | ||
| 19 | @RestController | 21 | @RestController |
| @@ -31,7 +33,7 @@ public class RecoderProxyController { | @@ -31,7 +33,7 @@ public class RecoderProxyController { | ||
| 31 | 33 | ||
| 32 | @ResponseBody | 34 | @ResponseBody |
| 33 | @RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8") | 35 | @RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8") |
| 34 | - public Object proxy(HttpServletRequest request, HttpServletResponse response){ | 36 | + public Object proxy(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException{ |
| 35 | 37 | ||
| 36 | 38 | ||
| 37 | String baseRequestURI = request.getRequestURI(); | 39 | String baseRequestURI = request.getRequestURI(); |
| @@ -51,7 +53,7 @@ public class RecoderProxyController { | @@ -51,7 +53,7 @@ public class RecoderProxyController { | ||
| 51 | mediaInfo.getSdpIp(), | 53 | mediaInfo.getSdpIp(), |
| 52 | mediaConfig.getRecordAssistPort(), | 54 | mediaConfig.getRecordAssistPort(), |
| 53 | baseRequestURI.substring(baseRequestURI.indexOf(mediaId) + mediaId.length()), | 55 | baseRequestURI.substring(baseRequestURI.indexOf(mediaId) + mediaId.length()), |
| 54 | - URLDecoder.decode(request.getQueryString()) | 56 | + URLDecoder.decode(request.getQueryString(), "UTF-8") |
| 55 | ); | 57 | ); |
| 56 | // 发送请求 | 58 | // 发送请求 |
| 57 | RestTemplate restTemplate = new RestTemplate(); | 59 | RestTemplate restTemplate = new RestTemplate(); |