From 842c0049ea8498ea4adb3ca119157561b4d7df4f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 17:26:37 +0800
Subject: [PATCH] 2025-12-08 zwy 整理设备属性设置无人机不在线时返回前端错误提示代码为自定义代码，设备已离线和机场代码共用一个，无法区分机场和无人机设备。
---
ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
index 8658cbc..0645288 100644
--- a/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/manage/service/impl/ControlServiceImpl.java
@@ -6,6 +6,8 @@
import com.ard.sample.component.mqtt.service.IMessageSenderService;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
+import com.ard.sample.component.websocket.enums.MessageType;
+import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.component.websocket.service.ISendMessageService;
import com.ard.sample.manage.model.dto.BasicDeviceProperty;
import com.ard.sample.manage.model.dto.DeviceDTO;
@@ -37,7 +39,13 @@
private IMessageSenderService messageSenderService;
@Autowired
+ private DockWebSocketHandler _dockWebSocketHandler;
+
+ @Autowired
private ISendMessageService webSocketMessageService;
+
+ @Autowired
+ private IDeviceService _deviceService;
// @Autowired
// private IWebSocketManageService webSocketManageService;
@@ -55,13 +63,21 @@
return ResponseResult.error("The " + serviceIdentifier + " method does not exist.");
}
+
Object data = "";
// Add parameter validation.
if (Objects.nonNull(controlMethodEnum.getClazz())) {
if (Objects.isNull(param)) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
- BasicDeviceProperty basicDeviceProperty = mapper.convertValue(param.getAction(), controlMethodEnum.getClazz());
+ BasicDeviceProperty basicDeviceProperty = null;
+ if(serviceIdentifier.equals("sdr_workmode_switch")){
+ basicDeviceProperty= mapper.convertValue(param.getLink_workmode(), controlMethodEnum.getClazz());
+ }
+ else
+ {
+ basicDeviceProperty = mapper.convertValue(param.getAction(), controlMethodEnum.getClazz());
+ }
if (!basicDeviceProperty.valid()) {
return ResponseResult.error(CommonErrorEnum.ILLEGAL_ARGUMENT);
}
@@ -70,7 +86,7 @@
boolean isExist = deviceService.checkDeviceOnline(sn);
if (!isExist) {
- return ResponseResult.error("The dock is offline.");
+ return ResponseResult.error(CommonErrorEnum.DEVICE_OFFLINE.getErrorMsg());
}
String topic = TopicConst.THING_MODEL_PRE + TopicConst.PRODUCT + sn + TopicConst.SERVICES_SUF;
String bid = UUID.randomUUID().toString();
@@ -86,14 +102,28 @@
ServiceReply<EventsOutputReceiver> serviceReply = mapper.convertValue(
serviceReplyOpt, new TypeReference<ServiceReply<EventsOutputReceiver>>() {});
if (ResponseResult.CODE_SUCCESS != serviceReply.getResult()) {
- return ResponseResult.error(serviceReply.getResult(),
- Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus() : "errorCode: "
- + serviceReply.getResult());
+ String errorMsg = CommonErrorEnum.getMsgByCode(serviceReply.getResult());
+ return ResponseResult.error(serviceReply.getResult(),errorMsg);
+// return ResponseResult.error(serviceReply.getResult(),
+// Objects.nonNull(serviceReply.getOutput()) ? serviceReply.getOutput().getStatus() : "errorCode: "
+// + serviceReply.getResult());
}
if (controlMethodEnum.getProgress()) {
RedisOpsUtils.setWithExpire(serviceIdentifier + RedisConst.DELIMITER + bid, sn,
RedisConst.DEVICE_ALIVE_SECOND * RedisConst.DEVICE_ALIVE_SECOND);
}
+ // 执行操作成功后，更新摄像头内外镜头状态
+ if(RemoteControlMethodEnum.COVER_OPEN == controlMethodEnum) {
+ // 打开盖子,切换机场舱内摄像头镜头
+ //打开，摄像头为舱内；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
+ _deviceService.setRedisCameraPosition(sn,0);
+ }
+ if(RemoteControlMethodEnum.COVER_CLOSE == controlMethodEnum) {
+ // 关闭盖子,切换机场舱外摄像头镜头
+ //关闭，摄像头为舱外；将摄像头状态存到redis，格式为：CONVERSTATE:设备SN：1（舱外）或0（舱内）
+ _deviceService.setRedisCameraPosition(sn,1);
+ }
+
return ResponseResult.success();
}
@@ -105,12 +135,21 @@
if (RedisOpsUtils.getExpire(key) <= 0) {
return;
}
+ // 更新设备列表状态--关闭舱盖中...
+ String method = receiver.getMethod();
+ String deviceSn = receiver.getGateway();
+ if(method.equals("cover_close")){
+ _deviceService.updateWorkType(deviceSn, 2L);
+ RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, 2, RedisConst.DEVICE_ALIVE_SECOND);
+ }
String sn = RedisOpsUtils.get(key).toString();
-
+ receiver.setType(MessageType.PROGRESS.getType());
EventsReceiver<EventsOutputReceiver> eventsReceiver = mapper.convertValue(receiver.getData(),
new TypeReference<EventsReceiver<EventsOutputReceiver>>(){});
eventsReceiver.setBid(receiver.getBid());
- eventsReceiver.setSn(sn);
+ eventsReceiver.setGateway(sn);
+ eventsReceiver.setType(MessageType.PROGRESS.getType());
+ eventsReceiver.setMethod(receiver.getMethod());
log.info("SN: {}, {} ===> Control progress: {}",
sn, receiver.getMethod(), eventsReceiver.getOutput().getProgress().toString());
@@ -133,6 +172,21 @@
// .timestamp(System.currentTimeMillis())
// .bizCode(receiver.getMethod())
// .build());
+ // 更新设备列表状态--飞行器开机中...
+ if(method.equals("drone_open")){
+ _deviceService.updateWorkType(device.getChildDeviceSn(), 7L);
+ RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 7, RedisConst.DEVICE_ALIVE_SECOND);
+ }
+
+ String dockProgress ="";
+ try {
+ dockProgress = mapper.writeValueAsString(eventsReceiver);
+ }
+ catch (Exception e) {
+ e.printStackTrace();
+ }
+ // 设备控制进度消息websocket发给前端
+ _dockWebSocketHandler.sendMessageToSubscribers(sn, MessageType.PROGRESS.getType(), dockProgress);
if (receiver.getNeedReply() != null && receiver.getNeedReply() == 1) {
String topic = headers.get(MqttHeaders.RECEIVED_TOPIC) + TopicConst._REPLY_SUF;
--
Gitblit v1.9.3