From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 24 九月 2022 21:04:58 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 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 9c7d203..eb79fc7 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
@@ -413,24 +413,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