2025-11-3 zwy 机场与飞行器状态中机场sn字段值改为gateway

zhaowenyu

2025-11-03 929bdcb35152ce74774a2abf8a3a8b5d8d9b7fa3

 ard-sample/src/main/java/com/ard/sample/manage/service/impl/DockOSDServiceImpl.java

@@ -1,5 +1,7 @@
package com.ard.sample.manage.service.impl;

import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
import com.ard.sample.component.mqtt.model.CommonTopicReceiver;
import com.ard.sample.component.websocket.config.ConcurrentWebSocketSession;
import com.ard.sample.component.websocket.enums.MessageType;
@@ -52,11 +54,10 @@
        if (DeviceDomainEnum.DOCK.getVal() == device.getDomain()) {
            wsMessage.setBizCode(BizCodeEnum.DOCK_OSD.getCode());
            OsdDockReceiver data = mapper.convertValue(receiver.getData(), OsdDockReceiver.class);
            receiver.setType(MessageType.STATUS.getType());
//            receiver.setType(MessageType.STATUS.getType());
            String dockOsd="";
            String dockOsdData="";
            try{
                dockOsd=mapper.writeValueAsString(receiver);
                dockOsdData=mapper.writeValueAsString(receiver.getData());
                if (dockOsdData.contains("flighttask_step_code")) {
                    JsonNode jsonNode = mapper.readTree(dockOsdData);
@@ -67,10 +68,11 @@
                            //只要状态 "0":"作业准备中","1":"飞行作业中","5":"任务空闲"
                            if(code == 0 || code == 1 || code == 5) {
                                _deviceService.updateWorkType(deviceSn,code);
                                RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + deviceSn, code, RedisConst.DEVICE_ALIVE_SECOND);
                            }
                        }
                    }

                    receiver.setType(MessageType.STATUS.getType()+"-flighttask");
                } else if (dockOsdData.contains("network_state")) {
                    JsonNode jsonNode = mapper.readTree(dockOsdData);
                    if (jsonNode.has("drone_in_dock") && jsonNode.get("sub_device").has("device_online_status")) {
@@ -80,10 +82,14 @@
                        if(inDock.equals(1L) && deviceOnlineStatus.equals(0L))
                        {// 飞行器在舱内且关机状态为6
                            _deviceService.updateWorkType(childDeviceSn,6L);
                            RedisOpsUtils.setWithExpire(RedisConst.OSD_STATUS_PREFIX + device.getChildDeviceSn(), 6, RedisConst.DEVICE_ALIVE_SECOND);
                        }
                    }
                    receiver.setType(MessageType.STATUS.getType()+"-network");
                } else if (dockOsdData.contains("job_number")) {
                    receiver.setType(MessageType.STATUS.getType()+"-job");
                }
                dockOsd=mapper.writeValueAsString(receiver);
            }catch (Exception e){
                e.printStackTrace();
            }