From 6bcfae60f8c2eaa9c859add62bf14f8c2ce23537 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Mon, 10 Mar 2025 13:20:19 +0800
Subject: [PATCH] 调整业务包路径
---
ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavControlManager.java | 4 ++--
ard-work/src/main/java/com/ard/tianyu/service/control/UavControlService.java | 11 ++++++-----
2 files changed, 8 insertions(+), 7 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..a58c63b 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
@@ -3,6 +3,7 @@
import com.ard.common.exception.NoPermissionException;
import com.ard.common.utils.SecurityUtils;
import com.ard.tianyu.websocket.domain.UavControlType;
+import com.ard.tianyu.websocket.handler.UavControlManager;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -15,7 +16,7 @@
public class UavControlService {
@Resource
- private WebSocketService webSocketService;
+ private UavControlManager uavControlManager;
/**
* 记录当前获得飞行控制权限的用户
@@ -63,7 +64,7 @@
}
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("当前已拥有控制权");
}
@@ -98,9 +99,9 @@
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);
@@ -131,7 +132,7 @@
}
controlMap.remove(boxSn);
- webSocketService.sendControlRelease(boxSn, controlType.getType());
+ uavControlManager.sendControlRelease(boxSn, controlType.getType());
return true;
}
diff --git a/ard-work/src/main/java/com/ard/tianyu/service/control/WebSocketService.java b/ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavControlManager.java
similarity index 95%
rename from ard-work/src/main/java/com/ard/tianyu/service/control/WebSocketService.java
rename to ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavControlManager.java
index 1a312a1..de927df 100644
--- a/ard-work/src/main/java/com/ard/tianyu/service/control/WebSocketService.java
+++ b/ard-work/src/main/java/com/ard/tianyu/websocket/handler/UavControlManager.java
@@ -1,4 +1,4 @@
-package com.ard.tianyu.service.control;
+package com.ard.tianyu.websocket.handler;
import com.alibaba.fastjson2.JSON;
import com.ard.tianyu.websocket.domain.BaseMessage;
@@ -7,7 +7,7 @@
import org.springframework.stereotype.Service;
@Service
-public class WebSocketService {
+public class UavControlManager {
/**
--
Gitblit v1.9.3