From 82fd369ce554467f794c9aa66e453adecefc73a9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 16:56:13 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 86 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 39 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 8a64684..37fb98e 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,6 +2,7 @@
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.bean.SubscribeHolder;
@@ -17,6 +18,7 @@
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
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.github.pagehelper.PageInfo;
import io.swagger.v3.oas.annotations.Operation;
@@ -30,14 +32,18 @@
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 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.*;
@Tag(name = "鍥芥爣璁惧鏌ヨ", description = "鍥芥爣璁惧鏌ヨ")
@@ -81,10 +87,9 @@
@Operation(summary = "鏌ヨ鍥芥爣璁惧")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@GetMapping("/devices/{deviceId}")
- public ResponseEntity<Device> devices(@PathVariable String deviceId){
+ public Device devices(@PathVariable String deviceId){
- Device device = storager.queryVideoDevice(deviceId);
- return new ResponseEntity<>(device,HttpStatus.OK);
+ return storager.queryVideoDevice(deviceId);
}
/**
@@ -123,18 +128,17 @@
@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
@Parameter(name = "catalogUnderDevice", description = "鏄惁鐩村睘涓庤澶囩殑鐩綍")
- public ResponseEntity<PageInfo> channels(@PathVariable String deviceId,
+ 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,
@RequestParam(required = false) Boolean catalogUnderDevice) {
- if (StringUtils.isEmpty(query)) {
+ if (ObjectUtils.isEmpty(query)) {
query = null;
}
- PageInfo pageResult = storager.queryChannelsByDeviceId(deviceId, query, channelType, online, catalogUnderDevice, page, count);
- return new ResponseEntity<>(pageResult,HttpStatus.OK);
+ return storager.queryChannelsByDeviceId(deviceId, query, channelType, online, catalogUnderDevice, page, count);
}
/**
@@ -154,11 +158,8 @@
boolean status = deviceService.isSyncRunning(deviceId);
// 宸插瓨鍦ㄥ垯杩斿洖杩涘害
if (status) {
- WVPResult<SyncStatus> wvpResult = new WVPResult<>();
- wvpResult.setCode(0);
SyncStatus channelSyncStatus = deviceService.getChannelSyncStatus(deviceId);
- wvpResult.setData(channelSyncStatus);
- return wvpResult;
+ return WVPResult.success(channelSyncStatus);
}
deviceService.sync(device);
@@ -176,7 +177,7 @@
@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璋冪敤锛宒eviceId锛�" + deviceId);
@@ -200,10 +201,10 @@
}
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璋冪敤澶辫触锛�");
}
}
@@ -317,13 +318,18 @@
result.setResult(new ResponseEntity(String.format("璁惧%s涓嶅瓨鍦�", deviceId),HttpStatus.OK));
return result;
}
- 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);
- });
+ 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
@@ -370,14 +376,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
@@ -402,7 +413,8 @@
wvpResult.setCode(-1);
wvpResult.setMsg("鍚屾灏氭湭寮�濮�");
}else {
- wvpResult.setCode(0);
+ wvpResult.setCode(ErrorCode.SUCCESS.getCode());
+ wvpResult.setMsg(ErrorCode.SUCCESS.getMsg());
wvpResult.setData(channelSyncStatus);
if (channelSyncStatus.getErrorMsg() != null) {
wvpResult.setMsg(channelSyncStatus.getErrorMsg());
@@ -414,24 +426,20 @@
@GetMapping("/{deviceId}/subscribe_info")
@Operation(summary = "鑾峰彇璁惧鐨勮闃呯姸鎬�")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
- public WVPResult<Map<String, String>> getSubscribeInfo(@PathVariable String deviceId) {
+ public WVPResult<Map<String, Integer>> getSubscribeInfo(@PathVariable String deviceId) {
Set<String> allKeys = dynamicTask.getAllKeys();
- Map<String, String> dialogStateMap = new HashMap<>();
+ Map<String, Integer> dialogStateMap = new HashMap<>();
for (String key : allKeys) {
if (key.startsWith(deviceId)) {
ISubscribeTask subscribeTask = (ISubscribeTask)dynamicTask.get(key);
- DialogState dialogState = subscribeTask.getDialogState();
- if (dialogState == null) {
- continue;
- }
if (subscribeTask instanceof CatalogSubscribeTask) {
- dialogStateMap.put("catalog", dialogState.toString());
+ dialogStateMap.put("catalog", 1);
}else if (subscribeTask instanceof MobilePositionSubscribeTask) {
- dialogStateMap.put("mobilePosition", dialogState.toString());
+ dialogStateMap.put("mobilePosition", 1);
}
}
}
- WVPResult<Map<String, String>> wvpResult = new WVPResult<>();
+ WVPResult<Map<String, Integer>> wvpResult = new WVPResult<>();
wvpResult.setCode(0);
wvpResult.setData(dialogStateMap);
return wvpResult;
--
Gitblit v1.8.0