From ce309155d4a0d750f786ca242b36bba8fc0bbf14 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Tue, 22 Oct 2024 17:26:43 +0800
Subject: [PATCH] 优化
---
ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java b/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java
index 3438c14..de07206 100644
--- a/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java
+++ b/ard-work/src/main/java/com/ard/tianyu/service/impl/TyServiceImpl.java
@@ -7,6 +7,7 @@
import com.ard.tianyu.model.dto.BoxSettingsDTO;
import com.ard.tianyu.model.receiver.*;
import com.ard.tianyu.netty.command.BaseCommand;
+import com.ard.tianyu.netty.command.ControlAngleCommand;
import com.ard.tianyu.netty.command.HeartbeatCommand;
import com.ard.tianyu.netty.command.RegisterCommand;
import com.ard.tianyu.netty.TyNettyTcpClient;
@@ -42,7 +43,7 @@
/**
* 获取天宇token信息
*
- * @return
+ * @return AccessTokenReceiver
*/
@Override
public AccessTokenReceiver getAccessToken() {
@@ -52,31 +53,31 @@
/**
* 获取云盒列表
*
- * @return
+ * @return List<BoxInfoReceiver>
*/
@Override
- public List<BoxReceiver> getBoxList() {
+ public List<BoxInfoReceiver> getBoxList() {
//请求云盒列表
- TyHttpCommonReceiver<List<BoxReceiver>> boxListReveiver = tyClient.getBoxList(tyConfiguration.getAccessToken().convertFromDTO());
+ TyHttpCommonReceiver<List<BoxInfoReceiver>> boxListReveiver = tyClient.getBoxList(tyConfiguration.getAccessToken().convertFromDTO());
return boxListReveiver.getContent();
}
/**
* 获取直播地址
*
- * @return
+ * @return BoxStreamUrlReceiver
*/
@Override
- public PullStreamUrlReceiver getBoxLiveUrl(String boxSn) {
+ public BoxStreamUrlReceiver getBoxLiveUrl(String boxSn) {
- TyHttpCommonReceiver<PullStreamUrlReceiver> boxLiveUrl = tyClient.getBoxLiveUrl(boxSn, tyConfiguration.getAccessToken().convertFromDTO());
+ TyHttpCommonReceiver<BoxStreamUrlReceiver> boxLiveUrl = tyClient.getBoxLiveUrl(boxSn, tyConfiguration.getAccessToken().convertFromDTO());
return boxLiveUrl.getContent();
}
/**
* 获取飞行历史
*
- * @return
+ * @return List<BoxHistoryReceiver>
*/
@Override
public List<BoxHistoryReceiver> getBoxHistory(BoxHistoryDTO boxHistoryDTO) {
@@ -87,7 +88,7 @@
/**
* 获取盒子图片
*
- * @return
+ * @return List<BoxPhotosReceiver>
*/
@Override
public List<BoxPhotosReceiver> getBoxPhotos(BoxPhotosDTO boxPhotosDTO) {
@@ -100,11 +101,13 @@
*/
@Override
public Boolean updateBoxSettings(BoxSettingsDTO boxSettingsDTO) {
- TyHttpCommonReceiver<String> result = tyClient.updateBoxSettings(boxSettingsDTO, tyConfiguration.getAccessToken().convertFromDTO());
+ TyHttpCommonReceiver<?> result = tyClient.updateBoxSettings(boxSettingsDTO, tyConfiguration.getAccessToken().convertFromDTO());
return result.getState() == 1;
}
-
+ /**
+ * 注册天宇平台
+ */
@Override
public void registerMessage() {
AccessTokenReceiver tyToken = tyConfiguration.getAccessToken();
@@ -112,34 +115,36 @@
this.sendMessage(tyConfiguration.getIpPort(), registerMessage);
}
- public boolean sendMessage(String key, BaseCommand msg) {
- //将从用户接收的信息发送到天宇 commandCache
- boolean cmdResult = false;
+ /**
+ * 发送消息
+ */
+ public void sendMessage(String key, BaseCommand msg) {
try {
ChannelFuture future = TyNettyTcpClient.channels.get(key).getFuture();
Channel channel = future.channel();
- if (future != null && channel.isActive()) {
+ if (channel.isActive()) {
InetSocketAddress ipSocket = (InetSocketAddress) channel.remoteAddress();
String host = ipSocket.getHostString();
int port = ipSocket.getPort();
// 创建 ByteBuf 并编码消息
ByteBuf buffer = Unpooled.buffer();
msg.encode(buffer); // 确保对消息进行编码
-
channel.writeAndFlush(buffer); // 发送编码后的数据
- cmdResult = true;
- log.info("向天宇服务器" + host + ":" + port + "发送数据" + "，命令码：" + msg.getCmdCode());
+ log.info("向天宇服务器【{}:{}】发送数据，命令码：{}", host, port, String.format("0x%02X", msg.getCmdCode() & 0xFF));
} else {
log.error("与天宇服务器链接断开，无法发送数据！");
}
} catch (Exception e) {
- log.info("Failed to publish the message. {}", "转发信息");
- e.printStackTrace();
- } finally {
- return cmdResult;
+ log.error("发送消息异常：{}", e.getMessage());
}
}
+ @Override
+ public void controlAngle(String boxSn) {
+ ControlAngleCommand controlAngleCommand = new ControlAngleCommand(boxSn.getBytes(), (byte) 0x00, (byte) 0x00, (byte) 0x05);
+ this.sendMessage(tyConfiguration.getIpPort(), controlAngleCommand);
+ }
+
@Scheduled(fixedRate = 5000)
public void sendHeartBeat() {
long timestamp = System.currentTimeMillis();
--
Gitblit v1.9.3