Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2025-10-31 ddf364ed076204206fbba47f2947b30cbbd21ecb

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

@@ -52,11 +52,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);
@@ -70,7 +69,7 @@
                            }
                        }
                    }

                    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")) {
@@ -82,8 +81,11 @@
                            _deviceService.updateWorkType(childDeviceSn,6L);
                        }
                    }
                    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();
            }