去除编译报警
This commit is contained in:
parent
5310ceeb81
commit
cd345f1a14
@ -2,7 +2,6 @@ package com.genersoft.iot.vmp.gb28181.transmit.request.impl;
|
|||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.text.SimpleDateFormat;
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
import javax.sip.address.SipURI;
|
import javax.sip.address.SipURI;
|
||||||
|
@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
|
|||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
@Component
|
@Component
|
||||||
public class ZLMMediaListManager {
|
public class ZLMMediaListManager {
|
||||||
|
|
||||||
|
@ -4,12 +4,10 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.genersoft.iot.vmp.conf.MediaConfig;
|
import com.genersoft.iot.vmp.conf.MediaConfig;
|
||||||
import okhttp3.*;
|
import okhttp3.*;
|
||||||
import org.checkerframework.checker.units.qual.A;
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.io.*;
|
import java.io.*;
|
||||||
|
@ -17,6 +17,7 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@SuppressWarnings("rawtypes")
|
||||||
/**
|
/**
|
||||||
* 处理onvif的各种操作
|
* 处理onvif的各种操作
|
||||||
*/
|
*/
|
||||||
|
@ -56,7 +56,7 @@ public class GbStreamController {
|
|||||||
*/
|
*/
|
||||||
@ApiOperation("移除国标关联")
|
@ApiOperation("移除国标关联")
|
||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
@ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true ,
|
@ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true,
|
||||||
dataTypeClass = GbStreamParam.class),
|
dataTypeClass = GbStreamParam.class),
|
||||||
})
|
})
|
||||||
@DeleteMapping(value = "/del")
|
@DeleteMapping(value = "/del")
|
||||||
@ -77,7 +77,7 @@ public class GbStreamController {
|
|||||||
*/
|
*/
|
||||||
@ApiOperation("保存国标关联")
|
@ApiOperation("保存国标关联")
|
||||||
@ApiImplicitParams({
|
@ApiImplicitParams({
|
||||||
@ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true , dataTypeClass = GbStreamParam.class),
|
@ApiImplicitParam(name = "gbStreamParam", value = "GbStreamParam", required = true, dataTypeClass = GbStreamParam.class),
|
||||||
})
|
})
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
|
@ -14,6 +14,8 @@ import org.springframework.web.client.RestTemplate;
|
|||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.URLDecoder;
|
import java.net.URLDecoder;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@ -31,7 +33,7 @@ public class RecoderProxyController {
|
|||||||
|
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
@RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8")
|
@RequestMapping(value = "/**/**/**", produces = "application/json;charset=UTF-8")
|
||||||
public Object proxy(HttpServletRequest request, HttpServletResponse response){
|
public Object proxy(HttpServletRequest request, HttpServletResponse response) throws UnsupportedEncodingException{
|
||||||
|
|
||||||
|
|
||||||
String baseRequestURI = request.getRequestURI();
|
String baseRequestURI = request.getRequestURI();
|
||||||
@ -51,7 +53,7 @@ public class RecoderProxyController {
|
|||||||
mediaInfo.getSdpIp(),
|
mediaInfo.getSdpIp(),
|
||||||
mediaConfig.getRecordAssistPort(),
|
mediaConfig.getRecordAssistPort(),
|
||||||
baseRequestURI.substring(baseRequestURI.indexOf(mediaId) + mediaId.length()),
|
baseRequestURI.substring(baseRequestURI.indexOf(mediaId) + mediaId.length()),
|
||||||
URLDecoder.decode(request.getQueryString())
|
URLDecoder.decode(request.getQueryString(), "UTF-8")
|
||||||
);
|
);
|
||||||
// 发送请求
|
// 发送请求
|
||||||
RestTemplate restTemplate = new RestTemplate();
|
RestTemplate restTemplate = new RestTemplate();
|
||||||
|
Loading…
Reference in New Issue
Block a user