From 694076dc8c447754b02dff24a891249f54427ffb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 16 十一月 2022 09:39:27 +0800
Subject: [PATCH] 优化国标级联发流并发能力
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index d4928ec..48dbbc4 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -1,9 +1,10 @@
package com.genersoft.iot.vmp.web.gb28181;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
@@ -26,6 +27,8 @@
@Autowired
private IVideoManagerStorage storager;
+ @Autowired
+ private IDeviceService deviceService;
// @Autowired
// private SIPCommander cmder;
@@ -37,7 +40,7 @@
// private DeviceOffLineDetector offLineDetector;
/**
- * 鍒嗛〉鑾峰彇璁惧鍒楄〃 TODO 鐜板湪鐩存帴杩斿洖锛屽皻鏈疄鐜板垎椤�
+ * 鍒嗛〉鑾峰彇璁惧鍒楄〃 鐜板湪鐩存帴杩斿洖锛屽皻鏈疄鐜板垎椤�
* @param start
* @param limit
* @param q
@@ -127,11 +130,11 @@
deviceJOSNChannel.put("DeviceID", device.getDeviceId());
deviceJOSNChannel.put("DeviceName", device.getName());
deviceJOSNChannel.put("DeviceOnline", device.getOnline() == 1);
- deviceJOSNChannel.put("Channel", 0); // TODO 鑷畾涔夊簭鍙�
+ deviceJOSNChannel.put("Channel", 0); // 鑷畾涔夊簭鍙�
deviceJOSNChannel.put("Name", deviceChannel.getName());
deviceJOSNChannel.put("Custom", false);
deviceJOSNChannel.put("CustomName", "");
- deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // TODO ? 瀛愯妭鐐规暟, SubCount > 0 琛ㄧず璇ラ�氶亾涓哄瓙鐩綍
+ deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // 瀛愯妭鐐规暟, SubCount > 0 琛ㄧず璇ラ�氶亾涓哄瓙鐩綍
deviceJOSNChannel.put("SnapURL", "");
deviceJOSNChannel.put("Manufacturer ", deviceChannel.getManufacture());
deviceJOSNChannel.put("Model", deviceChannel.getModel());
@@ -146,8 +149,8 @@
// 2-鍩轰簬鍙ｄ护鐨勫弻鍚戣璇�,
// 3-鍩轰簬鏁板瓧璇佷功鐨勫弻鍚戣璇�
deviceJOSNChannel.put("Status", deviceChannel.getStatus());
- deviceJOSNChannel.put("Longitude", deviceChannel.getLongitude());
- deviceJOSNChannel.put("Latitude", deviceChannel.getLatitude());
+ deviceJOSNChannel.put("Longitude", deviceChannel.getLongitudeWgs84());
+ deviceJOSNChannel.put("Latitude", deviceChannel.getLatitudeWgs84());
deviceJOSNChannel.put("PTZType ", deviceChannel.getPTZType()); // 浜戝彴绫诲瀷, 0 - 鏈煡, 1 - 鐞冩満, 2 - 鍗婄悆,
// 3 - 鍥哄畾鏋満, 4 - 閬ユ帶鏋満
deviceJOSNChannel.put("CustomPTZType", "");
--
Gitblit v1.8.0