forked from uav/ard-uav-server
blame | history | patch | commit | commitdiff | ignore whitespace
zhaowenyu
2025-12-06 8ccdc1da5a12248af84383b92c1bcd1ea921b71f 
 ard-admin/src/main/java/com/ard/web/controller/sample/DeviceController.java


@@ -97,7 +97,7 @@


    @ApiOperation("设备列表")


    @PreAuthorize("@ss.hasPermi('device:dock:list')")


    @GetMapping("/list")


    public ResponseResult<List<DeviceDTO>> getDevices(String nickname) {


    public ResponseResult<List<DeviceDTO>> getDevices(@RequestParam(required = false) String nickname) {


//        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb();


        List<DeviceDTO> devicesList = deviceService.getDockList(nickname);


        return ResponseResult.success(devicesList);


@@ -265,6 +265,7 @@


                .workType(dto.getWorkType())


                .webrtcUrl(dto.getWebrtcUrl())


                .cameraWebrtcUrl(dto.getCameraWebrtcUrl())


                .cameraState(dto.getCameraState())


                .compatibleStatus(dto.getFirmwareStatus() == null ? null :


                        DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != DeviceFirmwareStatusEnum.find(dto.getFirmwareStatus()))


                .build();