From 2e98b20bea4463e4465e3c19059d0744a09aec06 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 27 Jun 2023 14:34:41 +0800
Subject: [PATCH] gb28181版本升级-补充
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 657 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 429 insertions(+), 228 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index acd4fdd..571c86e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -2,36 +2,53 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
+import com.genersoft.iot.vmp.conf.exception.ControllerException;
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.bean.SubscribeHolder;
+import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
+import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
+import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
+import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.gb28181.vo.DeviceChannelVO;
+import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.vmanager.bean.DeviceChannelTree;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
+import com.genersoft.iot.vmp.vmanager.bean.ErrorCode;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
+import com.genersoft.iot.vmp.vmanager.gb28181.vo.PageVO;
import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.http.HttpResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.UUID;
+import javax.sip.DialogState;
+import javax.sip.InvalidArgumentException;
+import javax.sip.SipException;
+import java.io.*;
+import java.nio.file.Files;
+import java.text.ParseException;
+import java.util.*;
-@Api(tags = "国标设备查询", value = "国标设备查询")
+@Tag(name = "国标设备查询", description = "国标设备查询")
@SuppressWarnings("rawtypes")
@CrossOrigin
@RestController
@@ -41,7 +58,10 @@
private final static Logger logger = LoggerFactory.getLogger(DeviceQuery.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
+
+ @Autowired
+ private IDeviceChannelService deviceChannelService;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -51,9 +71,6 @@
@Autowired
private DeferredResultHolder resultHolder;
-
- @Autowired
- private DeviceOffLineDetector offLineDetector;
@Autowired
private IDeviceService deviceService;
@@ -66,19 +83,13 @@
* @param deviceId 国标ID
* @return 国标设备
*/
- @ApiOperation("使用ID查询国标设备")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "设备ID", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "查询国标设备")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
@GetMapping("/devices/{deviceId}")
- public ResponseEntity<Device> devices(@PathVariable String deviceId){
-
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询视频设备API调用，deviceId：" + deviceId);
-// }
-
- Device device = storager.queryVideoDevice(deviceId);
- return new ResponseEntity<>(device,HttpStatus.OK);
+ public Device devices(@PathVariable String deviceId, HttpServletResponse response){
+ //跨域设置
+ crossDomain(response);
+ return storager.queryVideoDevice(deviceId);
}
/**
@@ -87,19 +98,14 @@
* @param count 每页查询数量
* @return 分页国标列表
*/
- @ApiOperation("分页查询国标设备")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "page", value = "当前页", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name = "count", value = "每页查询数量", required = true, dataTypeClass = Integer.class),
- })
+ @Operation(summary = "分页查询国标设备")
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页查询数量", required = true)
@GetMapping("/devices")
- public PageInfo<Device> devices(int page, int count){
-
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询所有视频设备API调用");
-// }
-
- return storager.queryVideoDeviceList(page, count);
+ public PageInfo<Device> devices(int page, int count,@RequestParam(required = false) String name, HttpServletResponse response){
+ //跨域设置
+ crossDomain(response);
+ return storager.queryVideoDeviceList(page, count,name);
}
/**
@@ -111,32 +117,33 @@
* @param query 查询内容
* @param online 是否在线 在线 true / 离线 false
* @param channelType 设备 false/子目录 true
+ * @param catalogUnderDevice 是否直属与设备的目录
* @return 通道列表
*/
- @ApiOperation("分页查询通道")
@GetMapping("/devices/{deviceId}/channels")
- @ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "设备id", required = true ,dataTypeClass = String.class),
- @ApiImplicitParam(name="page", value = "当前页", required = true ,dataTypeClass = Integer.class),
- @ApiImplicitParam(name="count", value = "每页查询数量", required = true ,dataTypeClass = Integer.class),
- @ApiImplicitParam(name="query", value = "查询内容" ,dataTypeClass = String.class),
- @ApiImplicitParam(name="online", value = "是否在线" ,dataTypeClass = Boolean.class),
- @ApiImplicitParam(name="channelType", value = "设备/子目录-> false/true" ,dataTypeClass = Boolean.class),
- })
- public ResponseEntity<PageInfo> channels(@PathVariable String deviceId,
+ @Operation(summary = "分页查询通道")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页查询数量", required = true)
+ @Parameter(name = "query", description = "查询内容")
+ @Parameter(name = "online", description = "是否在线")
+ @Parameter(name = "channelType", description = "设备/子目录-> false/true")
+ @Parameter(name = "catalogUnderDevice", description = "是否直属与设备的目录")
+ public PageInfo channels(@PathVariable String deviceId,
int page, int count,
@RequestParam(required = false) String query,
@RequestParam(required = false) Boolean online,
- @RequestParam(required = false) Boolean channelType) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询视频设备通道API调用");
-// }
- if (StringUtils.isEmpty(query)) {
+ @RequestParam(required = false) Boolean channelType,
+ @RequestParam(required = false) Boolean catalogUnderDevice,
+ @RequestParam(required = false) String deptId,
+ HttpServletResponse response) {
+ //跨域设置
+ crossDomain(response);
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- PageInfo pageResult = storager.queryChannelsByDeviceId(deviceId, query, channelType, online, page, count);
- return new ResponseEntity<>(pageResult,HttpStatus.OK);
+ return storager.queryChannelsByDeviceId(deviceId, query, channelType, online, catalogUnderDevice, page, count,deptId);
}
/**
@@ -151,92 +158,120 @@
* @param channelType 设备 false/子目录 true
* @return 通道列表
*/
- @ApiOperation("分页查询通道")
@GetMapping("/devices/{deviceId}/channelsCar")
- @ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "设备id", required = true ,dataTypeClass = String.class),
- @ApiImplicitParam(name="page", value = "当前页", required = true ,dataTypeClass = Integer.class),
- @ApiImplicitParam(name="count", value = "每页查询数量", required = true ,dataTypeClass = Integer.class),
- @ApiImplicitParam(name="query", value = "查询内容" ,dataTypeClass = String.class),
- @ApiImplicitParam(name="type", value = "设备类型" ,dataTypeClass = String.class),
- @ApiImplicitParam(name="online", value = "是否在线" ,dataTypeClass = Boolean.class),
- @ApiImplicitParam(name="channelType", value = "设备/子目录-> false/true" ,dataTypeClass = Boolean.class),
- })
- public ResponseEntity<PageInfo> channelsCar(@PathVariable String deviceId,
- int page, int count,
- @RequestParam(required = false) String query,
- @RequestParam(required = false) String type,
- @RequestParam(required = false) Boolean online,
- @RequestParam(required = false) Boolean channelType,HttpServletResponse response) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询视频设备通道API调用");
-// }
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
- response.setHeader("Access-Control-Allow-Credentials","true");
-
- if (StringUtils.isEmpty(query)) {
+ @Operation(summary = "分页查询通道")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页查询数量", required = true)
+ @Parameter(name = "query", description = "查询内容")
+ @Parameter(name="type", description = "设备类型" )
+ @Parameter(name = "online", description = "是否在线")
+ @Parameter(name = "channelType", description = "设备/子目录-> false/true")
+ @Parameter(name = "catalogUnderDevice", description = "是否直属与设备的目录")
+ public PageInfo channelsCar(@PathVariable String deviceId,
+ int page, int count,
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) String type,
+ @RequestParam(required = false) String dwbh,
+ @RequestParam(required = false) Boolean online,
+ @RequestParam(required = false) Boolean channelType,
+ @RequestParam(required = false) Boolean catalogUnderDevice, HttpServletResponse response) {
+ //跨域设置
+ crossDomain(response);
+ if (ObjectUtils.isEmpty(query)) {
+ query = null;
+ }
+ //查询并返回
+ return storager.queryChannelsCarByDeviceId(deviceId, query,type, channelType,dwbh, online, catalogUnderDevice, page, count);
+ }
+ /**
+ * 查询所有通道数(车辆/摄像头)
+ *
+ * @param deviceId 设备id
+ * @param query 查询内容
+ * @param type 类型
+ * @param online 是否在线 在线 true / 离线 false
+ * @param channelType 设备 false/子目录 true
+ * @return 通道列表
+ */
+ @GetMapping("/devices/{deviceId}/channelsCarAll")
+ @Operation(summary = "分页查询通道")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页查询数量", required = true)
+ @Parameter(name = "query", description = "查询内容")
+ @Parameter(name="type", description = "设备类型" )
+ @Parameter(name = "online", description = "是否在线")
+ @Parameter(name = "channelType", description = "设备/子目录-> false/true")
+ @Parameter(name = "catalogUnderDevice", description = "是否直属与设备的目录")
+ public List<DeviceChannelVO> channelsCarAll(@PathVariable String deviceId,
+ @RequestParam(required = false) String query,
+ @RequestParam(required = false) String type,
+ @RequestParam(required = false) String dwbh,
+ @RequestParam(required = false) Boolean online,
+ @RequestParam(required = false) Boolean channelType,
+ @RequestParam(required = false) Boolean catalogUnderDevice, HttpServletResponse response) {
+ //跨域设置
+ crossDomain(response);
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- PageInfo pageResult = storager.queryChannelsCarByDeviceId(deviceId, query,type, channelType, online, page, count);
- return new ResponseEntity<>(pageResult,HttpStatus.OK);
+ return storager.channelsCarAll(deviceId, query,type, channelType,dwbh, online, catalogUnderDevice);
}
+ /**
+ * 设备面查询
+ * @param page
+ * @return
+ */
+ @PostMapping("/SpatialQueryList")
+ @Operation(summary = "设备面查询")
+ public PageInfo SpatialQueryList(@RequestBody PageVO page, HttpServletResponse response) {
+ //跨域设置
+ crossDomain(response);
+ return storager.SpatialQueryList(page);
+ }
+
+ /**
+ * 设备面查询-不分页
+ * @param page
+ * @return
+ */
+ @PostMapping("/spatialQueryListAll")
+ @Operation(summary = "设备面查询")
+ public Object spatialQueryListAll(@RequestBody PageVO page, HttpServletResponse response) {
+ //跨域设置
+ crossDomain(response);
+ return storager.spatialQueryListAll(page);
+ }
/**
* 同步设备通道
* @param deviceId 设备id
* @return
*/
- @ApiOperation("同步设备通道")
- @ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "同步设备通道")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
@PostMapping("/devices/{deviceId}/sync")
- public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){
+ public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
logger.debug("设备通道信息同步API调用，deviceId：" + deviceId);
}
Device device = storager.queryVideoDevice(deviceId);
- String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + deviceId;
- String uuid = UUID.randomUUID().toString();
- // 默认超时时间为30分钟
- DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(30*60*1000L);
- result.onTimeout(()->{
- logger.warn("设备[{}]通道信息同步超时", deviceId);
- // 释放rtpserver
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setId(uuid);
- WVPResult<Object> wvpResult = new WVPResult<>();
- wvpResult.setCode(-1);
- wvpResult.setData(device);
- wvpResult.setMsg("更新超时");
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
-
- });
- // 等待其他相同请求返回时一起返回
- if (resultHolder.exist(key, null)) {
- return result;
+ boolean status = deviceService.isSyncRunning(deviceId);
+ // 已存在则返回进度
+ if (status) {
+ SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
+ return WVPResult.success(channelSyncStatus);
}
- cmder.catalogQuery(device, event -> {
- RequestMessage msg = new RequestMessage();
- msg.setKey(key);
- msg.setId(uuid);
- WVPResult<Object> wvpResult = new WVPResult<>();
- wvpResult.setCode(-1);
- wvpResult.setData(device);
- wvpResult.setMsg(String.format("同步通道失败，错误码： %s, %s", event.statusCode, event.msg));
- msg.setData(wvpResult);
- resultHolder.invokeAllResult(msg);
- });
+ deviceService.sync(device);
- resultHolder.put(key, uuid, result);
- return result;
+ WVPResult<SyncStatus> wvpResult = new WVPResult<>();
+ wvpResult.setCode(0);
+ wvpResult.setMsg("开始同步");
+ return wvpResult;
}
/**
@@ -244,29 +279,37 @@
* @param deviceId 设备id
* @return
*/
- @ApiOperation("移除设备")
- @ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "移除设备")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
@DeleteMapping("/devices/{deviceId}/delete")
- public ResponseEntity<String> delete(@PathVariable String deviceId){
+ public String delete(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
logger.debug("设备信息删除API调用，deviceId：" + deviceId);
}
// 清除redis记录
- boolean isSuccess = storager.delete(deviceId);
+ boolean isSuccess = deviceService.delete(deviceId);
if (isSuccess) {
redisCatchStorage.clearCatchByDeviceId(deviceId);
// 停止此设备的订阅更新
- dynamicTask.stop(deviceId);
+ Set<String> allKeys = dynamicTask.getAllKeys();
+ for (String key : allKeys) {
+ if (key.startsWith(deviceId)) {
+ Runnable runnable = dynamicTask.get(key);
+ if (runnable instanceof ISubscribeTask) {
+ ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+ subscribeTask.stop();
+ }
+ dynamicTask.stop(key);
+ }
+ }
JSONObject json = new JSONObject();
json.put("deviceId", deviceId);
- return new ResponseEntity<>(json.toString(),HttpStatus.OK);
+ return json.toString();
} else {
logger.warn("设备信息删除API调用失败！");
- return new ResponseEntity<String>("设备信息删除API调用失败！", HttpStatus.INTERNAL_SERVER_ERROR);
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备信息删除API调用失败！");
}
}
@@ -281,36 +324,32 @@
* @param channelType 通道类型
* @return 子通道列表
*/
- @ApiOperation("分页查询子目录通道")
- @ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name="channelId", value = "通道id", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name="page", value = "当前页", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name="count", value = "每页条数", required = true, dataTypeClass = Integer.class),
- @ApiImplicitParam(name="query", value = "查询内容", dataTypeClass = String.class),
- @ApiImplicitParam(name="online", value = "是否在线", dataTypeClass = String.class),
- @ApiImplicitParam(name="channelType", value = "通道类型， 子目录", dataTypeClass = Boolean.class),
- })
+ @Operation(summary = "分页查询子目录通道")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页查询数量", required = true)
+ @Parameter(name = "query", description = "查询内容")
+ @Parameter(name = "online", description = "是否在线")
+ @Parameter(name = "channelType", description = "设备/子目录-> false/true")
@GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
- public ResponseEntity<PageInfo> subChannels(@PathVariable String deviceId,
+ public PageInfo subChannels(@PathVariable String deviceId,
@PathVariable String channelId,
int page,
int count,
@RequestParam(required = false) String query,
- @RequestParam(required = false) String online,
+ @RequestParam(required = false) String deptId,
+ @RequestParam(required = false) Boolean online,
@RequestParam(required = false) Boolean channelType){
-// if (logger.isDebugEnabled()) {
-// logger.debug("查询所有视频通道API调用");
-// }
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
if (deviceChannel == null) {
PageInfo<DeviceChannel> deviceChannelPageResult = new PageInfo<>();
- return new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
+ return deviceChannelPageResult;
}
- PageInfo pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
- return new ResponseEntity<>(pageResult,HttpStatus.OK);
+ PageInfo pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count,deptId);
+ return pageResult;
}
/**
@@ -319,15 +358,12 @@
* @param channel 通道
* @return
*/
- @ApiOperation("更新通道信息")
- @ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name="channel", value = "通道", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "更新通道信息")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channel", description = "通道信息", required = true)
@PostMapping("/channel/update/{deviceId}")
- public ResponseEntity<PageInfo> updateChannel(@PathVariable String deviceId,DeviceChannel channel){
- storager.updateChannel(deviceId, channel);
- return new ResponseEntity<>(null,HttpStatus.OK);
+ public void updateChannel(@PathVariable String deviceId,DeviceChannel channel){
+ deviceChannelService.updateChannel(deviceId, channel);
}
/**
@@ -336,18 +372,37 @@
* @param streamMode 数据流传输模式
* @return
*/
- @ApiOperation("修改数据流传输模式")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "streamMode", value = "数据流传输模式, 取值：" +
- "UDP（udp传输），TCP-ACTIVE（tcp主动模式,暂不支持），TCP-PASSIVE（tcp被动模式）", dataTypeClass = String.class),
- })
+ @Operation(summary = "修改数据流传输模式")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "streamMode", description = "数据流传输模式, 取值：" +
+ "UDP（udp传输），TCP-ACTIVE（tcp主动模式,暂不支持），TCP-PASSIVE（tcp被动模式）", required = true)
@PostMapping("/transport/{deviceId}/{streamMode}")
- public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
- Device device = storager.queryVideoDevice(deviceId);
+ public void updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
+ Device device = deviceService.getDevice(deviceId);
device.setStreamMode(streamMode);
- storager.updateDevice(device);
- return new ResponseEntity<>(null,HttpStatus.OK);
+ deviceService.updateCustomDevice(device);
+ }
+
+ /**
+ * 添加设备信息
+ * @param device 设备信息
+ * @return
+ */
+ @Operation(summary = "添加设备信息")
+ @Parameter(name = "device", description = "设备", required = true)
+ @PostMapping("/device/add/")
+ public void addDevice(Device device){
+
+ if (device == null || device.getDeviceId() == null) {
+ throw new ControllerException(ErrorCode.ERROR400);
+ }
+
+ // 查看deviceId是否存在
+ boolean exist = deviceService.isExist(device.getDeviceId());
+ if (exist) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "设备编号已存在");
+ }
+ deviceService.addDevice(device);
}
/**
@@ -355,38 +410,14 @@
* @param device 设备信息
* @return
*/
- @ApiOperation("更新设备信息")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "device", value = "设备信息", required = true, dataTypeClass = Device.class)
- })
+ @Operation(summary = "更新设备信息")
+ @Parameter(name = "device", description = "设备", required = true)
@PostMapping("/device/update/")
- public ResponseEntity<WVPResult<String>> updateDevice(Device device){
+ public void updateDevice(Device device){
if (device != null && device.getDeviceId() != null) {
- Device deviceInStore = storager.queryVideoDevice(device.getDeviceId());
- if (!StringUtils.isEmpty(device.getName())) deviceInStore.setName(device.getName());
- if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
- if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());
-
- if (device.getSubscribeCycleForCatalog() > 0) {
- if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
- // 开启订阅
- deviceService.addCatalogSubscribe(deviceInStore);
- }
- }else if (device.getSubscribeCycleForCatalog() == 0) {
- if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
- // 取消订阅
- deviceService.removeCatalogSubscribe(deviceInStore);
- }
- }
-
- storager.updateDevice(device);
- cmder.deviceInfoQuery(device);
+ deviceService.updateCustomDevice(device);
}
- WVPResult<String> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- return new ResponseEntity<>(result,HttpStatus.OK);
}
/**
@@ -394,10 +425,8 @@
*
* @param deviceId 设备id
*/
- @ApiOperation("设备状态查询")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- })
+ @Operation(summary = "设备状态查询")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
@GetMapping("/devices/{deviceId}/status")
public DeferredResult<ResponseEntity<String>> deviceStatusApi(@PathVariable String deviceId) {
if (logger.isDebugEnabled()) {
@@ -406,14 +435,23 @@
Device device = storager.queryVideoDevice(deviceId);
String uuid = UUID.randomUUID().toString();
String key = DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId;
- cmder.deviceStatusQuery(device, event -> {
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData(String.format("获取设备状态失败，错误码： %s, %s", event.statusCode, event.msg));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(2*1000L);
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(2*1000L);
+ if(device == null) {
+ result.setResult(new ResponseEntity(String.format("设备%s不存在", deviceId),HttpStatus.OK));
+ return result;
+ }
+ try {
+ cmder.deviceStatusQuery(device, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("获取设备状态失败，错误码： %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[命令发送失败] 获取设备状态: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
+ }
result.onTimeout(()->{
logger.warn(String.format("获取设备状态超时"));
// 释放rtpserver
@@ -438,16 +476,14 @@
* @param endTime 报警发生终止时间（可选）
* @return true = 命令发送成功
*/
- @ApiOperation("设备报警查询")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "deviceId", value = "设备id", required = true, dataTypeClass = String.class),
- @ApiImplicitParam(name = "startPriority", value = "报警起始级别", dataTypeClass = String.class),
- @ApiImplicitParam(name = "endPriority", value = "报警终止级别", dataTypeClass = String.class),
- @ApiImplicitParam(name = "alarmMethod", value = "报警方式条件", dataTypeClass = String.class),
- @ApiImplicitParam(name = "alarmType", value = "报警类型", dataTypeClass = String.class),
- @ApiImplicitParam(name = "startTime", value = "报警发生起始时间", dataTypeClass = String.class),
- @ApiImplicitParam(name = "endTime", value = "报警发生终止时间", dataTypeClass = String.class),
- })
+ @Operation(summary = "设备状态查询")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "startPriority", description = "报警起始级别")
+ @Parameter(name = "endPriority", description = "报警终止级别")
+ @Parameter(name = "alarmMethod", description = "报警方式条件")
+ @Parameter(name = "alarmType", description = "报警类型")
+ @Parameter(name = "startTime", description = "报警发生起始时间")
+ @Parameter(name = "endTime", description = "报警发生终止时间")
@GetMapping("/alarm/{deviceId}")
public DeferredResult<ResponseEntity<String>> alarmApi(@PathVariable String deviceId,
@RequestParam(required = false) String startPriority,
@@ -462,14 +498,19 @@
Device device = storager.queryVideoDevice(deviceId);
String key = DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId;
String uuid = UUID.randomUUID().toString();
- cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> {
- RequestMessage msg = new RequestMessage();
- msg.setId(uuid);
- msg.setKey(key);
- msg.setData(String.format("设备报警查询失败，错误码： %s, %s",event.statusCode, event.msg));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String >> (3 * 1000L);
+ try {
+ cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("设备报警查询失败，错误码： %s, %s",event.statusCode, event.msg));
+ resultHolder.invokeResult(msg);
+ });
+ } catch (InvalidArgumentException | SipException | ParseException e) {
+ logger.error("[命令发送失败] 设备报警查询: {}", e.getMessage());
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "命令发送失败: " + e.getMessage());
+ }
+ DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String >> (3 * 1000L);
result.onTimeout(()->{
logger.warn(String.format("设备报警查询超时"));
// 释放rtpserver
@@ -483,9 +524,169 @@
return result;
}
- @GetMapping("/{deviceId}/tree")
- @ApiOperation(value = "通道树形结构", notes = "通道树形结构")
- public WVPResult<List<DeviceChannelTree>> tree(@PathVariable String deviceId) {
- return WVPResult.Data(storager.tree(deviceId));
+
+ @GetMapping("/{deviceId}/sync_status")
+ @Operation(summary = "获取通道同步进度")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ public WVPResult<SyncStatus> getSyncStatus(@PathVariable String deviceId) {
+ SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
+ WVPResult<SyncStatus> wvpResult = new WVPResult<>();
+ if (channelSyncStatus == null) {
+ wvpResult.setCode(-1);
+ wvpResult.setMsg("同步尚未开始");
+ }else {
+ wvpResult.setCode(ErrorCode.SUCCESS.getCode());
+ wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
+ wvpResult.setData(channelSyncStatus);
+ if (channelSyncStatus.getErrorMsg() != null) {
+ wvpResult.setMsg(channelSyncStatus.getErrorMsg());
+ }
+ }
+ return wvpResult;
+ }
+
+ @GetMapping("/{deviceId}/subscribe_info")
+ @Operation(summary = "获取设备的订阅状态")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ public WVPResult<Map<String, Integer>> getSubscribeInfo(@PathVariable String deviceId) {
+ Set<String> allKeys = dynamicTask.getAllKeys();
+ Map<String, Integer> dialogStateMap = new HashMap<>();
+ for (String key : allKeys) {
+ if (key.startsWith(deviceId)) {
+ ISubscribeTask subscribeTask = (ISubscribeTask)dynamicTask.get(key);
+ if (subscribeTask instanceof CatalogSubscribeTask) {
+ dialogStateMap.put("catalog", 1);
+ }else if (subscribeTask instanceof MobilePositionSubscribeTask) {
+ dialogStateMap.put("mobilePosition", 1);
+ }
+ }
+ }
+ WVPResult<Map<String, Integer>> wvpResult = new WVPResult<>();
+ wvpResult.setCode(0);
+ wvpResult.setData(dialogStateMap);
+ return wvpResult;
+ }
+
+ @GetMapping("/snap/{deviceId}/{channelId}")
+ @Operation(summary = "请求截图")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "channelId", description = "通道国标编号", required = true)
+ public void getSnap(HttpServletResponse resp, @PathVariable String deviceId, @PathVariable String channelId) {
+
+ try {
+ final InputStream in = Files.newInputStream(new File("snap" + File.separator + deviceId + "_" + channelId + ".jpg").toPath());
+ resp.setContentType(MediaType.IMAGE_PNG_VALUE);
+ IOUtils.copy(in, resp.getOutputStream());
+ } catch (IOException e) {
+ resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+ }
+ }
+
+ /**
+ * 查询国标树
+ * @param deviceId 设备ID
+ * @param parentId 父ID
+ * @param deptId 辖区id
+ * @param page 当前页
+ * @param count 每页条数
+ * @return 国标设备
+ */
+ @Operation(summary = "查询国标树")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "parentId", description = "父级国标编号")
+ @Parameter(name = "deptId", description = "辖区id")
+ @Parameter(name = "onlyCatalog", description = "只获取目录")
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页条数", required = true)
+ @GetMapping("/tree/{deviceId}")
+ public ResponseEntity<PageInfo> getTree(@PathVariable String deviceId,
+ @RequestParam(required = false) String parentId,
+ @RequestParam(required = false) String deptId,
+ @RequestParam(required = false) Boolean onlyCatalog,
+ int page, int count){
+
+
+ if (page <= 0) {
+ page = 1;
+ }
+ if (onlyCatalog == null) {
+ onlyCatalog = false;
+ }
+
+ List<BaseTree<DeviceChannel>> treeData = deviceService.queryVideoDeviceTree(deviceId, parentId, onlyCatalog,deptId);
+ if (treeData == null || (page - 1) * count > treeData.size()) {
+ PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
+ pageInfo.setPageNum(page);
+ pageInfo.setTotal(treeData == null? 0 : treeData.size());
+ pageInfo.setSize(0);
+ pageInfo.setList(new ArrayList<>());
+ return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+ }
+
+ int toIndex = Math.min(page * count, treeData.size());
+ // 处理分页
+ List<BaseTree<DeviceChannel>> trees = treeData.subList((page - 1) * count, toIndex);
+ PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
+ pageInfo.setPageNum(page);
+ pageInfo.setTotal(treeData.size());
+ pageInfo.setSize(trees.size());
+ pageInfo.setList(trees);
+
+ return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+ }
+
+ /**
+ * 查询国标树下的通道
+ * @param deviceId 设备ID
+ * @param parentId 父ID
+ * @param page 当前页
+ * @param count 每页条数
+ * @return 国标设备
+ */
+ @Operation(summary = "查询国标树下的通道")
+ @Parameter(name = "deviceId", description = "设备国标编号", required = true)
+ @Parameter(name = "parentId", description = "父级国标编号")
+ @Parameter(name = "page", description = "当前页", required = true)
+ @Parameter(name = "count", description = "每页条数", required = true)
+ @GetMapping("/tree/channel/{deviceId}")
+ public ResponseEntity<PageInfo> getChannelInTreeNode(@PathVariable String deviceId,
+ @RequestParam(required = false) String parentId,
+ @RequestParam(required = false) String deptId,
+ int page, int count){
+
+ if (page <= 0) {
+ page = 1;
+ }
+
+ List<DeviceChannel> treeData = deviceService.queryVideoDeviceInTreeNode(deviceId, parentId,deptId);
+ if (treeData == null || (page - 1) * count > treeData.size()) {
+ PageInfo<BaseTree<DeviceChannel>> pageInfo = new PageInfo<>();
+ pageInfo.setPageNum(page);
+ pageInfo.setTotal(treeData == null? 0 : treeData.size());
+ pageInfo.setSize(0);
+ pageInfo.setList(new ArrayList<>());
+ return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+ }
+
+ int toIndex = Math.min(page * count, treeData.size());
+ // 处理分页
+ List<DeviceChannel> trees = treeData.subList((page - 1) * count, toIndex);
+ PageInfo<DeviceChannel> pageInfo = new PageInfo<>();
+ pageInfo.setPageNum(page);
+ pageInfo.setTotal(treeData.size());
+ pageInfo.setSize(trees.size());
+ pageInfo.setList(trees);
+
+ return new ResponseEntity<>(pageInfo,HttpStatus.OK);
+ }
+
+ /**
+ * 配置跨域设置
+ * @param response
+ */
+ private void crossDomain(HttpServletResponse response) {
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials","true");
}
}
--
Gitblit v1.9.3