THENG
/
a-tuoheng-device
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加group/docks/2

This commit is contained in:
孙小云 2026-01-22 20:05:40 +08:00
parent d70132180b
commit 31454217ea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ruoyi/device/controller/DockController.java
View File

@ -6,6 +6,8 @@ import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.device.api.domain.DockDetailVO; import com.ruoyi.device.api.domain.DockDetailVO;
import com.ruoyi.device.api.domain.DockUpdateRequest; import com.ruoyi.device.api.domain.DockUpdateRequest;
import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.api.domain.DockWithGPSVO;
import com.ruoyi.device.controller.convert.DockWithGPSVOConvert;
import com.ruoyi.device.service.api.IDockService; import com.ruoyi.device.service.api.IDockService;
import com.ruoyi.device.service.api.IBufferDeviceService; import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.dto.DockDetailDTO; import com.ruoyi.device.service.dto.DockDetailDTO;
@ -92,7 +94,7 @@ public class DockController extends BaseController
*/ */
//@InnerAuth //@InnerAuth
@GetMapping("/list") @GetMapping("/list")
public R<List<DockVO>> getAllDocks() public R<List<DockWithGPSVO>> getAllDocks()
{ {
List<DockDTO> dockDTOs = dockService.selectDockList(new DockDTO()); List<DockDTO> dockDTOs = dockService.selectDockList(new DockDTO());
List<DockDetailDTO> dtoList = new ArrayList<>(); List<DockDetailDTO> dtoList = new ArrayList<>();
@ -100,6 +102,6 @@ public class DockController extends BaseController
DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockDTO.getDockId()); DockDetailDTO dockDetailDTO = bufferDeviceService.getDockDetailById(dockDTO.getDockId());
dtoList.add(dockDetailDTO); dtoList.add(dockDetailDTO);
} }
return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList)); return R.ok(DockWithGPSVOConvert.fromList(dtoList));
} }
} }