机场新增和查询优化。

sample/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java

@@ -669,6 +669,11 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity>
         }
         }
         DeviceDTO device = devicesList.get(0);
         DeviceDTO device = devicesList.get(0);
         device.setStatus(deviceRedisService.checkDeviceOnline(sn));
         device.setStatus(deviceRedisService.checkDeviceOnline(sn));
+        // 查询 无人机
+        List<DeviceDTO> childrenList = this.getDevicesByParams(DeviceQueryParam.builder().deviceSn(device.getChildDeviceSn()).build());
+        if (!devicesList.isEmpty()) {
+            device.setChildren(childrenList.get(0));
+        }
         return Optional.of(device);
         return Optional.of(device);
     }
     }
 
 
@@ -1017,14 +1022,23 @@ public class DeviceServiceImpl extends ServiceImpl<IDeviceMapper, DeviceEntity>
                 // 飞机存在
                 // 飞机存在
 
 
                 if (StringUtils.hasText(drone.getWorkspaceId())) {
                 if (StringUtils.hasText(drone.getWorkspaceId())) {
-                    throw new RuntimeException("The current drone has been bound");
-                }
 
 
-                // 绑定无人机
-                LambdaUpdateWrapper<DeviceEntity> updateDroneWrapper = new LambdaUpdateWrapper<>();
-                updateDroneWrapper.set(DeviceEntity::getWorkspaceId, dock.getWorkspaceId());
-                updateDroneWrapper.eq(DeviceEntity::getDeviceSn, droneSn);
-                int updateDroneInt = mapper.update(new DeviceEntity(), updateDroneWrapper);
+                    // 假如是绑定了其他客户的设备 那么报错
+                    if (!drone.getWorkspaceId().equals(dock.getWorkspaceId())) {
+                        throw new RuntimeException("The current drone has been bound");
+                    } else {
+                        // 绑定了自己的设备
+
+                        // 是否需要改动什么？
+
+                    }
+                } else {
+                    // 绑定无人机
+                    LambdaUpdateWrapper<DeviceEntity> updateDroneWrapper = new LambdaUpdateWrapper<>();
+                    updateDroneWrapper.set(DeviceEntity::getWorkspaceId, dock.getWorkspaceId());
+                    updateDroneWrapper.eq(DeviceEntity::getDeviceSn, droneSn);
+                    int updateDroneInt = mapper.update(new DeviceEntity(), updateDroneWrapper);
+                }
             }
             }
         }
         }