From 497e581e5e26840400f5f2cd1cf083c3de5e66c2 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期一, 27 九月 2021 15:36:41 +0800
Subject: [PATCH] 处理报警和位置上报时使用fromHeader获取deviceId, xml的deviceId作为channelId使用。
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 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 e243d23..cb08ba3 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,8 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.*;
import org.slf4j.Logger;
@@ -21,6 +23,7 @@
import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import javax.sip.message.Response;
+import java.io.UnsupportedEncodingException;
@Api(tags = "鍥芥爣璁惧鏌ヨ", value = "鍥芥爣璁惧鏌ヨ")
@SuppressWarnings("rawtypes")
@@ -33,6 +36,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
private SIPCommander cmder;
@@ -128,15 +134,14 @@
*/
@ApiOperation("鍚屾璁惧閫氶亾")
@ApiImplicitParams({
- @ApiImplicitParam(name="deviceId", value = "璁惧id", required = true ,dataTypeClass = String.class),
+ @ApiImplicitParam(name="deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
})
@PostMapping("/devices/{deviceId}/sync")
public DeferredResult<ResponseEntity<Device>> devicesSync(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
- }
logger.debug("璁惧閫氶亾淇℃伅鍚屾API璋冪敤锛宒eviceId锛�" + deviceId);
-
+ }
Device device = storager.queryVideoDevice(deviceId);
cmder.catalogQuery(device, event -> {
Response response = event.getResponse();
@@ -145,7 +150,7 @@
msg.setData(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
resultHolder.invokeResult(msg);
});
- DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(2*1000L);
+ DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(15*1000L);
result.onTimeout(()->{
logger.warn(String.format("璁惧閫氶亾淇℃伅鍚屾瓒呮椂"));
// 閲婃斁rtpserver
@@ -177,8 +182,10 @@
if (offLineDetector.isOnline(deviceId)) {
return new ResponseEntity<String>("涓嶅厑璁稿垹闄ゅ湪绾胯澶囷紒", HttpStatus.NOT_ACCEPTABLE);
}
+ // 娓呴櫎redis璁板綍
boolean isSuccess = storager.delete(deviceId);
if (isSuccess) {
+ redisCatchStorage.clearCatchByDeviceId(deviceId);
JSONObject json = new JSONObject();
json.put("deviceId", deviceId);
return new ResponseEntity<>(json.toString(),HttpStatus.OK);
@@ -258,7 +265,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "deviceId", value = "璁惧id", required = true, dataTypeClass = String.class),
@ApiImplicitParam(name = "streamMode", value = "鏁版嵁娴佷紶杈撴ā寮�, 鍙栧�硷細" +
- "UDP锛坲dp浼犺緭锛夛紝TCP-ACTIVE锛坱cp涓诲姩妯″紡,鏆備笉鏀寔锛夛紝TCP-PASSIVE锛坱cp琚姩妯″紡锛�"),
+ "UDP锛坲dp浼犺緭锛夛紝TCP-ACTIVE锛坱cp涓诲姩妯″紡,鏆備笉鏀寔锛夛紝TCP-PASSIVE锛坱cp琚姩妯″紡锛�", dataTypeClass = String.class),
})
@PostMapping("/transport/{deviceId}/{streamMode}")
public ResponseEntity<PageInfo> updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
@@ -269,6 +276,32 @@
}
/**
+ * 鏇存柊璁惧淇℃伅
+ * @param device 璁惧淇℃伅
+ * @return
+ */
+ @ApiOperation("鏇存柊璁惧淇℃伅")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "device", value = "璁惧淇℃伅", required = true, dataTypeClass = Device.class)
+ })
+ @PostMapping("/device/update/")
+ public ResponseEntity<WVPResult<String>> 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());
+ storager.updateDevice(deviceInStore);
+ cmder.deviceInfoQuery(deviceInStore);
+ }
+ WVPResult<String> result = new WVPResult<>();
+ result.setCode(0);
+ result.setMsg("success");
+ return new ResponseEntity<>(result,HttpStatus.OK);
+ }
+
+ /**
* 璁惧鐘舵�佹煡璇㈣姹侫PI鎺ュ彛
*
* @param deviceId 璁惧id
--
Gitblit v1.8.0