From 66eda32ab97d6e94e9f274d6faa4df586c452dfb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期日, 25 六月 2023 10:18:29 +0800
Subject: [PATCH] 优化端口预占用
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 11bc621..0ff8ba1 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
@@ -14,6 +14,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
@@ -24,6 +25,7 @@
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.ibatis.annotations.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -46,7 +48,7 @@
@Tag(name = "鍥芥爣璁惧鏌ヨ", description = "鍥芥爣璁惧鏌ヨ")
@SuppressWarnings("rawtypes")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/device/query")
public class DeviceQuery {
@@ -61,6 +63,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
@Autowired
private SIPCommander cmder;
@@ -97,8 +102,10 @@
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@GetMapping("/devices")
+ @Options()
public PageInfo<Device> devices(int page, int count){
-
+// if (page == null) page = 0;
+// if (count == null) count = 20;
return storager.queryVideoDeviceList(page, count,null);
}
@@ -123,7 +130,7 @@
@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
@Parameter(name = "catalogUnderDevice", description = "鏄惁鐩村睘涓庤澶囩殑鐩綍")
- public PageInfo channels(@PathVariable String deviceId,
+ public PageInfo<DeviceChannel> channels(@PathVariable String deviceId,
int page, int count,
@RequestParam(required = false) String query,
@RequestParam(required = false) Boolean online,
@@ -181,7 +188,7 @@
// 娓呴櫎redis璁板綍
boolean isSuccess = deviceService.delete(deviceId);
if (isSuccess) {
- redisCatchStorage.clearCatchByDeviceId(deviceId);
+ inviteStreamService.clearInviteInfo(deviceId);
// 鍋滄姝よ澶囩殑璁㈤槄鏇存柊
Set<String> allKeys = dynamicTask.getAllKeys();
for (String key : allKeys) {
@@ -223,7 +230,7 @@
@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
@GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
- public PageInfo subChannels(@PathVariable String deviceId,
+ public PageInfo<DeviceChannel> subChannels(@PathVariable String deviceId,
@PathVariable String channelId,
int page,
int count,
@@ -237,8 +244,7 @@
return deviceChannelPageResult;
}
- PageInfo pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
- return pageResult;
+ return storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
}
/**
--
Gitblit v1.8.0