XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除冗余代码，修正编译报警项

Browse Source
This commit is contained in:
lawrencehj
2021-02-05 15:15:39 +08:00
parent 6868577e32
commit a8603075d4
42 changed files with 114 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,12 +4,9 @@ import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.ptz.PtzController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
/**

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

@@ -5,11 +5,9 @@ import com.genersoft.iot.vmp.conf.SipConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
/**

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

@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
// import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
// import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
// import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -19,6 +19,7 @@ import java.util.List;
/**
* 兼容LiveGBS的API：设备信息
*/
@SuppressWarnings("unchecked")
@CrossOrigin
@RestController
@RequestMapping(value = "/api/v1/device")
@@ -29,14 +30,14 @@ public class ApiDeviceController {
@Autowired
private IVideoManagerStorager storager;
@Autowired
private SIPCommander cmder;
// @Autowired
// private SIPCommander cmder;
@Autowired
private DeferredResultHolder resultHolder;
// @Autowired
// private DeferredResultHolder resultHolder;
@Autowired
private DeviceOffLineDetector offLineDetector;
// @Autowired
// private DeviceOffLineDetector offLineDetector;
/**
* 分页获取设备列表 TODO 现在直接返回，尚未实现分页

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

@@ -1,21 +1,18 @@
package com.genersoft.iot.vmp.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
// import com.genersoft.iot.vmp.media.zlm.ZLMRESTfulUtils;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.play.PlayController;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
@@ -23,6 +20,7 @@ import org.springframework.web.context.request.async.DeferredResult;
/**
* 兼容LiveGBS的API：实时直播
*/
@SuppressWarnings(value = {"rawtypes", "unchecked"})
@CrossOrigin
@RestController
@RequestMapping(value = "/api/v1/stream")
@@ -40,8 +38,8 @@ public class ApiStreamController {
private IRedisCatchStorage redisCatchStorage;
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
// @Autowired
// private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired

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

@@ -1,9 +1,6 @@
package com.genersoft.iot.vmp.web;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;