From bb508127e9454e8b39ac7d431765b6de0ac74c35 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Sat, 06 Sep 2025 15:39:02 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java b/ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java
index 1500f3e..318a602 100644
--- a/ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java
+++ b/ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java
@@ -1,11 +1,14 @@
package com.ard.tianyu.service.control;
-import com.ard.common.exception.NoPermissionException;
+import com.ard.common.exception.ControlException;
import com.ard.common.utils.SecurityUtils;
-import com.ard.tianyu.websocket.domain.UavControlType;
+import com.ard.tianyu.domain.message.UavControlType;
+import com.ard.tianyu.component.websocket.handler.UavControlManager;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -15,7 +18,7 @@
public class UavControlService {
@Resource
- private WebSocketService webSocketService;
+ private UavControlManager uavControlManager;
/**
* 记录当前获得飞行控制权限的用户
@@ -63,9 +66,9 @@
}
if (!controller.equals(requester)) {
requestMap.put(boxSn, requester);
- webSocketService.sendControlRequest(controller, boxSn, controlType.getType(), requester);
+ uavControlManager.sendControlRequest(controller, boxSn, controlType.getType(), requester);
} else {
- throw new NoPermissionException("当前已拥有控制权");
+ throw new ControlException("当前已拥有控制权");
}
return false;
}
@@ -93,14 +96,14 @@
Long requester = requestMap.get(boxSn);
if (requester == null || requester.equals(controller)) {
- throw new NoPermissionException("无控制请求");
+ throw new ControlException("无控制请求");
}
if (approve) {
getControlMap(controlType).put(boxSn, requester);
- webSocketService.sendControlApproval(requester, boxSn, controlType.getType());
+ uavControlManager.sendControlApproval(requester, boxSn, controlType.getType());
} else {
- webSocketService.sendControlRejection(requester, boxSn, controlType.getType());
+ uavControlManager.sendControlRejection(requester, boxSn, controlType.getType());
}
requestMap.remove(boxSn);
@@ -127,11 +130,11 @@
ConcurrentHashMap<String, Long> controlMap = getControlMap(controlType);
if (!controller.equals(controlMap.get(boxSn))) {
- throw new NoPermissionException("没有该设备的" + controlType.getType().toUpperCase() + "控制权");
+ throw new ControlException("没有该设备的" + controlType.getType().toUpperCase() + "控制权");
}
controlMap.remove(boxSn);
- webSocketService.sendControlRelease(boxSn, controlType.getType());
+ uavControlManager.sendControlRelease(boxSn, controlType.getType());
return true;
}
@@ -157,7 +160,14 @@
UavControlType controlType = UavControlType.fromString(type);
return getControlMap(controlType).get(boxSn);
}
-
+ public Map<String,Long> getCurrentController(String boxSn) {
+ Long flyController = uavFlyControlMap.get(boxSn);
+ Map<String,Long> map=new HashMap<>();
+ map.put("flyController",flyController);
+ Long payloadController = uavPayloadControlMap.get(boxSn);
+ map.put("payloadController",payloadController);
+ return map;
+ }
/**
* 根据控制类型获取对应的控制 Map
*/
--
Gitblit v1.9.3