From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java b/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
index d8b0ad6..0eaf9d6 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/IDeviceService.java
@@ -106,12 +106,17 @@
/**
* 根据部门权限获取机场列表
* */
- List<DeviceDTO> getDockList();
+ List<DeviceDTO> getDockList(String nickname);
void spliceDeviceTopoPer(DeviceDTO gateway);
-// @DataScope(deptAlias = "d")
List<DeviceDTO> getDockListByParams(DeviceQueryParam param);
+
+// List<DeviceDTO> getDockCameraList(String nickname);
+
+// void spliceDeviceTopoCamera(DeviceDTO gateway);
+
+// List<DeviceDTO> getDockCameraListByParams(DeviceQueryParam param);
/**
* Query the information of the device according to the sn of the device.
@@ -165,7 +170,7 @@
Boolean updateWorkType(String sn, Long workType);
/**
- * 修改直播地址
+ * 修改机场及飞行器直播地址
* @param sn 設備sn
* @param webrtcUrl 直播地址
* */
@@ -236,7 +241,7 @@
* @param propertyEnum
* @param param
*/
- void devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param);
+ ResponseResult devicePropertySet(String dockSn, DeviceSetPropertyEnum propertyEnum, JsonNode param);
/**
* 更改静音模型
@@ -258,6 +263,9 @@
*/
Boolean checkDeviceOnline(String sn);
+ void sendCameraInfo();
+ void setRedisCameraPosition(String sn, Integer cameraPosition);
+ void setChildRedisCamera(String sn, String context);
// public List<DeviceEntity> selectList(Wrapper<DeviceEntity> queryWrapper);
}
\ No newline at end of file
--
Gitblit v1.9.3