Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

使用GetMapping替换RequestMapping

2.6.9
648540858 2024-02-29 18:15:55 +08:00
parent bb94831177
commit c581974027
6 changed files with 98 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
View File

@ -141,6 +141,9 @@ public class PlayController {
streamInfo.channgeStreamIp(host); streamInfo.channgeStreamIp(host);
} }
wvpResult.setData(new StreamContent(streamInfo)); wvpResult.setData(new StreamContent(streamInfo));
}else {
wvpResult.setCode(code);
wvpResult.setMsg(msg);
} }
}else { }else {
wvpResult.setCode(code); wvpResult.setCode(code);

5
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
View File

@ -8,6 +8,7 @@ import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
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.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -41,7 +42,7 @@ public class ApiControlController {
* @param speed 速度(0~255) 默认值: 129 * @param speed 速度(0~255) 默认值: 129
* @return * @return
*/ */
@RequestMapping(value = "/ptz") @GetMapping(value = "/ptz")
private void list(String serial,String command, private void list(String serial,String command,
@RequestParam(required = false)Integer channel, @RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code, @RequestParam(required = false)String code,
@ -114,7 +115,7 @@ public class ApiControlController {
* @param name 预置位名称, command=set 时有效 * @param name 预置位名称, command=set 时有效
* @return * @return
*/ */
@RequestMapping(value = "/preset") @GetMapping(value = "/preset")
private void list(String serial,String command, private void list(String serial,String command,
@RequestParam(required = false)Integer channel, @RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code, @RequestParam(required = false)String code,

7
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiController.java
View File

@ -6,6 +6,7 @@ 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.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
@ -23,7 +24,7 @@ public class ApiController {
private SipConfig sipConfig; private SipConfig sipConfig;
@RequestMapping("/getserverinfo") @GetMapping("/getserverinfo")
private JSONObject getserverinfo(){ private JSONObject getserverinfo(){
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
result.put("Authorization","ceshi"); result.put("Authorization","ceshi");
@ -50,7 +51,7 @@ public class ApiController {
return result; return result;
} }
@RequestMapping(value = "/userinfo") @GetMapping(value = "/userinfo")
private JSONObject userinfo(){ private JSONObject userinfo(){
// JSONObject result = new JSONObject(); // JSONObject result = new JSONObject();
// result.put("ID","ceshi"); // result.put("ID","ceshi");
@ -83,7 +84,7 @@ public class ApiController {
* @param password 密码(经过md5加密,32位长度,不带中划线,不区分大小写) * @param password 密码(经过md5加密,32位长度,不带中划线,不区分大小写)
* @return * @return
*/ */
@RequestMapping(value = "/login") @GetMapping(value = "/login")
@ResponseBody @ResponseBody
private JSONObject login(String username,String password ){ private JSONObject login(String username,String password ){
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {

7
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
View File

@ -18,6 +18,7 @@ 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.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -59,7 +60,7 @@ public class ApiDeviceController {
* @param online * @param online
* @return * @return
*/ */
@RequestMapping(value = "/list") @GetMapping(value = "/list")
public JSONObject list( @RequestParam(required = false)Integer start, public JSONObject list( @RequestParam(required = false)Integer start,
@RequestParam(required = false)Integer limit, @RequestParam(required = false)Integer limit,
@RequestParam(required = false)String q, @RequestParam(required = false)String q,
@ -105,7 +106,7 @@ public class ApiDeviceController {
return result; return result;
} }
@RequestMapping(value = "/channellist") @GetMapping(value = "/channellist")
public JSONObject channellist( String serial, public JSONObject channellist( String serial,
@RequestParam(required = false)String channel_type, @RequestParam(required = false)String channel_type,
@RequestParam(required = false)String code , @RequestParam(required = false)String code ,
@ -186,7 +187,7 @@ public class ApiDeviceController {
* @param timeout 超时时间(秒) 默认值: 15 * @param timeout 超时时间(秒) 默认值: 15
* @return * @return
*/ */
@RequestMapping(value = "/fetchpreset") @GetMapping(value = "/fetchpreset")
private DeferredResult<Object> list(String serial, private DeferredResult<Object> list(String serial,
@RequestParam(required = false)Integer channel, @RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code, @RequestParam(required = false)String code,

168
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiStreamController.java
View File

@ -3,6 +3,7 @@ package com.genersoft.iot.vmp.web.gb28181;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.InviteInfo; import com.genersoft.iot.vmp.common.InviteInfo;
import com.genersoft.iot.vmp.common.InviteSessionType; import com.genersoft.iot.vmp.common.InviteSessionType;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException; import com.genersoft.iot.vmp.conf.exception.SsrcTransactionNotFoundException;
import com.genersoft.iot.vmp.gb28181.bean.Device; import com.genersoft.iot.vmp.gb28181.bean.Device;
@ -13,15 +14,11 @@ import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.service.IInviteStreamService; import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.service.IPlayService; import com.genersoft.iot.vmp.service.IPlayService;
import com.genersoft.iot.vmp.service.bean.InviteErrorCode; import com.genersoft.iot.vmp.service.bean.InviteErrorCode;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage; import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
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.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.context.request.async.DeferredResult; import org.springframework.web.context.request.async.DeferredResult;
import javax.sip.InvalidArgumentException; import javax.sip.InvalidArgumentException;
@ -48,9 +45,6 @@ public class ApiStreamController {
@Autowired @Autowired
private UserSetting userSetting; private UserSetting userSetting;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@Autowired @Autowired
private IDeviceService deviceService; private IDeviceService deviceService;
@ -73,7 +67,7 @@ public class ApiStreamController {
* @param timeout 拉流超时(秒), * @param timeout 拉流超时(秒),
* @return * @return
*/ */
@RequestMapping(value = "/start") @GetMapping("/start")
private DeferredResult<JSONObject> start(String serial , private DeferredResult<JSONObject> start(String serial ,
@RequestParam(required = false)Integer channel , @RequestParam(required = false)Integer channel ,
@RequestParam(required = false)String code, @RequestParam(required = false)String code,
@ -85,107 +79,111 @@ public class ApiStreamController {
@RequestParam(required = false)String timeout @RequestParam(required = false)String timeout
){ ){
DeferredResult<JSONObject> resultDeferredResult = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10); DeferredResult<JSONObject> result = new DeferredResult<>(userSetting.getPlayTimeout().longValue() + 10);
Device device = storager.queryVideoDevice(serial); Device device = storager.queryVideoDevice(serial);
if (device == null ) { if (device == null ) {
JSONObject result = new JSONObject(); JSONObject resultJSON = new JSONObject();
result.put("error","device[ " + serial + " ]未找到"); resultJSON.put("error","device[ " + serial + " ]未找到");
resultDeferredResult.setResult(result); result.setResult(resultJSON);
return resultDeferredResult; return result;
}else if (!device.isOnLine()) { }else if (!device.isOnLine()) {
JSONObject result = new JSONObject(); JSONObject resultJSON = new JSONObject();
result.put("error","device[ " + code + " ]offline"); resultJSON.put("error","device[ " + code + " ]offline");
resultDeferredResult.setResult(result); result.setResult(resultJSON);
return resultDeferredResult; return result;
} }
resultDeferredResult.onTimeout(()->{ result.onTimeout(()->{
logger.info("播放等待超时"); logger.info("播放等待超时");
JSONObject result = new JSONObject(); JSONObject resultJSON = new JSONObject();
result.put("error","timeout"); resultJSON.put("error","timeout");
resultDeferredResult.setResult(result); result.setResult(resultJSON);
inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code);
storager.stopPlay(serial, code);
// 清理RTP server // 清理RTP server
}); });
DeviceChannel deviceChannel = storager.queryChannel(serial, code); DeviceChannel deviceChannel = storager.queryChannel(serial, code);
if (deviceChannel == null) { if (deviceChannel == null) {
JSONObject result = new JSONObject(); JSONObject resultJSON = new JSONObject();
result.put("error","channel[ " + code + " ]未找到"); resultJSON.put("error","channel[ " + code + " ]未找到");
resultDeferredResult.setResult(result); result.setResult(resultJSON);
return resultDeferredResult; return result;
}else if (!deviceChannel.isStatus()) { }else if (!deviceChannel.isStatus()) {
JSONObject result = new JSONObject(); JSONObject resultJSON = new JSONObject();
result.put("error","channel[ " + code + " ]offline"); resultJSON.put("error","channel[ " + code + " ]offline");
resultDeferredResult.setResult(result); result.setResult(resultJSON);
return resultDeferredResult; return result;
} }
MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device); MediaServerItem newMediaServerItem = playService.getNewMediaServerItem(device);
playService.play(newMediaServerItem, serial, code, null, (errorCode, msg, data) -> { playService.play(newMediaServerItem, serial, code, null, (errorCode, msg, data) -> {
if (errorCode == InviteErrorCode.SUCCESS.getCode()) { if (errorCode == InviteErrorCode.SUCCESS.getCode()) {
InviteInfo inviteInfo = inviteStreamService.getInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, serial, code); if (data != null) {
if (inviteInfo != null && inviteInfo.getStreamInfo() != null) { StreamInfo streamInfo = (StreamInfo)data;
JSONObject result = new JSONObject(); JSONObject resultJjson = new JSONObject();
result.put("StreamID", inviteInfo.getStreamInfo().getStream()); resultJjson.put("StreamID", streamInfo.getStream());
result.put("DeviceID", device.getDeviceId()); resultJjson.put("DeviceID", serial);
result.put("ChannelID", code); resultJjson.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName()); resultJjson.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName", ""); resultJjson.put("ChannelCustomName", "");
result.put("FLV", inviteInfo.getStreamInfo().getFlv().getUrl()); resultJjson.put("FLV", streamInfo.getFlv().getUrl());
if(inviteInfo.getStreamInfo().getHttps_flv() != null) { if(streamInfo.getHttps_flv() != null) {
result.put("HTTPS_FLV", inviteInfo.getStreamInfo().getHttps_flv().getUrl()); resultJjson.put("HTTPS_FLV", streamInfo.getHttps_flv().getUrl());
} }
result.put("WS_FLV", inviteInfo.getStreamInfo().getWs_flv().getUrl()); resultJjson.put("WS_FLV", streamInfo.getWs_flv().getUrl());
if(inviteInfo.getStreamInfo().getWss_flv() != null) { if(streamInfo.getWss_flv() != null) {
result.put("WSS_FLV", inviteInfo.getStreamInfo().getWss_flv().getUrl()); resultJjson.put("WSS_FLV", streamInfo.getWss_flv().getUrl());
} }
result.put("RTMP", inviteInfo.getStreamInfo().getRtmp().getUrl()); resultJjson.put("RTMP", streamInfo.getRtmp().getUrl());
if (inviteInfo.getStreamInfo().getRtmps() != null) { if (streamInfo.getRtmps() != null) {
result.put("RTMPS", inviteInfo.getStreamInfo().getRtmps().getUrl()); resultJjson.put("RTMPS", streamInfo.getRtmps().getUrl());
} }
result.put("HLS", inviteInfo.getStreamInfo().getHls().getUrl()); resultJjson.put("HLS", streamInfo.getHls().getUrl());
if (inviteInfo.getStreamInfo().getHttps_hls() != null) { if (streamInfo.getHttps_hls() != null) {
result.put("HTTPS_HLS", inviteInfo.getStreamInfo().getHttps_hls().getUrl()); resultJjson.put("HTTPS_HLS", streamInfo.getHttps_hls().getUrl());
} }
result.put("RTSP", inviteInfo.getStreamInfo().getRtsp().getUrl()); resultJjson.put("RTSP", streamInfo.getRtsp().getUrl());
if (inviteInfo.getStreamInfo().getRtsps() != null) { if (streamInfo.getRtsps() != null) {
result.put("RTSPS", inviteInfo.getStreamInfo().getRtsps().getUrl()); resultJjson.put("RTSPS", streamInfo.getRtsps().getUrl());
} }
result.put("WEBRTC", inviteInfo.getStreamInfo().getRtc().getUrl()); resultJjson.put("WEBRTC", streamInfo.getRtc().getUrl());
if (inviteInfo.getStreamInfo().getRtcs() != null) { if (streamInfo.getRtcs() != null) {
result.put("HTTPS_WEBRTC", inviteInfo.getStreamInfo().getRtcs().getUrl()); resultJjson.put("HTTPS_WEBRTC", streamInfo.getRtcs().getUrl());
} }
result.put("CDN", ""); resultJjson.put("CDN", "");
result.put("SnapURL", ""); resultJjson.put("SnapURL", "");
result.put("Transport", device.getTransport()); resultJjson.put("Transport", device.getTransport());
result.put("StartAt", ""); resultJjson.put("StartAt", "");
result.put("Duration", ""); resultJjson.put("Duration", "");
result.put("SourceVideoCodecName", ""); resultJjson.put("SourceVideoCodecName", "");
result.put("SourceVideoWidth", ""); resultJjson.put("SourceVideoWidth", "");
result.put("SourceVideoHeight", ""); resultJjson.put("SourceVideoHeight", "");
result.put("SourceVideoFrameRate", ""); resultJjson.put("SourceVideoFrameRate", "");
result.put("SourceAudioCodecName", ""); resultJjson.put("SourceAudioCodecName", "");
result.put("SourceAudioSampleRate", ""); resultJjson.put("SourceAudioSampleRate", "");
result.put("AudioEnable", ""); resultJjson.put("AudioEnable", "");
result.put("Ondemand", ""); resultJjson.put("Ondemand", "");
result.put("InBytes", ""); resultJjson.put("InBytes", "");
result.put("InBitRate", ""); resultJjson.put("InBitRate", "");
result.put("OutBytes", ""); resultJjson.put("OutBytes", "");
result.put("NumOutputs", ""); resultJjson.put("NumOutputs", "");
result.put("CascadeSize", ""); resultJjson.put("CascadeSize", "");
result.put("RelaySize", ""); resultJjson.put("RelaySize", "");
result.put("ChannelPTZType", "0"); resultJjson.put("ChannelPTZType", "0");
resultDeferredResult.setResult(result); result.setResult(resultJjson);
}else {
JSONObject resultJjson = new JSONObject();
resultJjson.put("error", "channel[ " + code + " ] " + msg);
result.setResult(resultJjson);
} }
}else { }else {
JSONObject result = new JSONObject(); JSONObject resultJjson = new JSONObject();
result.put("error", "channel[ " + code + " ] " + msg); resultJjson.put("error", "channel[ " + code + " ] " + msg);
resultDeferredResult.setResult(result); result.setResult(resultJjson);
} }
}); });
return resultDeferredResult; return result;
} }
/** /**
@ -196,7 +194,7 @@ public class ApiStreamController {
* @param check_outputs * @param check_outputs
* @return * @return
*/ */
@RequestMapping(value = "/stop") @GetMapping("/stop")
@ResponseBody @ResponseBody
private JSONObject stop(String serial , private JSONObject stop(String serial ,
@RequestParam(required = false)Integer channel , @RequestParam(required = false)Integer channel ,
@ -236,7 +234,7 @@ public class ApiStreamController {
* @param code 通道国标编号 * @param code 通道国标编号
* @return * @return
*/ */
@RequestMapping(value = "/touch") @GetMapping("/touch")
@ResponseBody @ResponseBody
private JSONObject touch(String serial ,String t, private JSONObject touch(String serial ,String t,
@RequestParam(required = false)Integer channel , @RequestParam(required = false)Integer channel ,

2
src/main/java/com/genersoft/iot/vmp/web/gb28181/AuthController.java
View File

@ -13,7 +13,7 @@ public class AuthController {
@Autowired @Autowired
private IUserService userService; private IUserService userService;
@RequestMapping("/login") @GetMapping("/login")
public String devices(String name, String passwd){ public String devices(String name, String passwd){
User user = userService.getUser(name, passwd); User user = userService.getUser(name, passwd);
if (user != null) { if (user != null) {