From f1d079f9c0b3d384090477ca54e0548373d62b57 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 16 Jan 2025 11:56:39 +0800
Subject: [PATCH] 配置修改
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 18 +++++++++++-------
1 files changed, 11 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 2e96fbe..667c3a0 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
@@ -4,7 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,7 +26,9 @@
private final static Logger logger = LoggerFactory.getLogger(ApiDeviceController.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
+ @Autowired
+ private IDeviceService deviceService;
// @Autowired
// private SIPCommander cmder;
@@ -59,7 +62,7 @@
devices = storager.queryVideoDeviceList();
result.put("DeviceCount", devices.size());
}else {
- PageInfo<Device> deviceList = storager.queryVideoDeviceList(start/limit, limit);
+ PageInfo<Device> deviceList = storager.queryVideoDeviceList(start/limit, limit,null);
result.put("DeviceCount", deviceList.getTotal());
devices = deviceList.getList();
}
@@ -95,6 +98,7 @@
@RequestParam(required = false)String dir_serial ,
@RequestParam(required = false)Integer start,
@RequestParam(required = false)Integer limit,
+ @RequestParam(required = false)String deptId,
@RequestParam(required = false)String q,
@RequestParam(required = false)Boolean online ){
@@ -110,7 +114,7 @@
return result;
}
List<DeviceChannel> deviceChannels;
- List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial);
+ List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial,deptId);
if (start == null || limit ==null) {
deviceChannels = allDeviceChannelList;
result.put("ChannelCount", deviceChannels.size());
@@ -133,7 +137,7 @@
deviceJOSNChannel.put("CustomName", "");
deviceJOSNChannel.put("SubCount", deviceChannel.getSubCount()); // TODO ? 子节点数, SubCount > 0 表示该通道为子目录
deviceJOSNChannel.put("SnapURL", "");
- deviceJOSNChannel.put("Manufacturer ", deviceChannel.getManufacture());
+ deviceJOSNChannel.put("manufacture ", deviceChannel.getManufacture());
deviceJOSNChannel.put("Model", deviceChannel.getModel());
deviceJOSNChannel.put("Owner", deviceChannel.getOwner());
deviceJOSNChannel.put("CivilCode", deviceChannel.getCivilCode());
@@ -146,8 +150,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.9.3