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:04:09 +08:00
parent 9bee1836dd
commit d70132180b
2 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/ruoyi/device/controller/GroupController.java
View File

@ -2,12 +2,9 @@ package com.ruoyi.device.controller;
import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.device.api.domain.DockVO; import com.ruoyi.device.api.domain.*;
import com.ruoyi.device.api.domain.GroupCreateRequest;
import com.ruoyi.device.api.domain.GroupUpdateRequest;
import com.ruoyi.device.api.domain.GroupVO;
import com.ruoyi.device.api.domain.SwitchDockGroupRequest;
import com.ruoyi.device.controller.convert.DockVOConvert; import com.ruoyi.device.controller.convert.DockVOConvert;
import com.ruoyi.device.controller.convert.DockWithGPSVOConvert;
import com.ruoyi.device.controller.convert.GroupVOConvert; import com.ruoyi.device.controller.convert.GroupVOConvert;
import com.ruoyi.device.service.api.IBufferDeviceService; import com.ruoyi.device.service.api.IBufferDeviceService;
import com.ruoyi.device.service.api.IGroupService; import com.ruoyi.device.service.api.IGroupService;
@ -102,7 +99,7 @@ public class GroupController extends BaseController
*/ */
//@InnerAuth //@InnerAuth
@GetMapping("/docks/{groupId}") @GetMapping("/docks/{groupId}")
public R<List<DockVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId) public R<List<DockWithGPSVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId)
{ {
logger.info("getDocksByGroupId {}", groupId); logger.info("getDocksByGroupId {}", groupId);
List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId); List<DockGroupDTO> groupDTOS = groupService.getDocksByGroupId(groupId);
@ -112,7 +109,7 @@ public class GroupController extends BaseController
dtoList.add(dockDetailDTO); dtoList.add(dockDetailDTO);
} }
return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList)); return R.ok(DockWithGPSVOConvert.fromList(dtoList));
} }
/** /**

52
src/main/java/com/ruoyi/device/controller/convert/DockWithGPSVOConvert.java Normal file
View File

@ -0,0 +1,52 @@
package com.ruoyi.device.controller.convert;
import com.ruoyi.common.core.utils.BaseConvert;
import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.api.domain.DockWithGPSVO;
import com.ruoyi.device.service.dto.DockDTO;
import com.ruoyi.device.service.dto.DockDetailDTO;
import org.springframework.beans.BeanUtils;
import java.util.List;
import java.util.stream.Collectors;
public class DockWithGPSVOConvert extends BaseConvert<DockDetailDTO, DockWithGPSVO>
{
private static final DockWithGPSVOConvert INSTANCE = new DockWithGPSVOConvert();
private DockWithGPSVOConvert() {
super(DockDetailDTO.class, DockWithGPSVO.class);
}
/**
* DTO 转 VO
*/
public static DockWithGPSVO from(DockDetailDTO dto)
{
return INSTANCE.innerFrom(dto);
}
/**
* VO 转 DTO
*/
public static DockDetailDTO to(DockWithGPSVO vo)
{
return INSTANCE.innerTo(vo);
}
public static List<DockWithGPSVO> fromList(List<DockDetailDTO> dtoList)
{
return INSTANCE.innerFromList(dtoList);
}
/**
* VO List 转 DTO List
*/
public static List<DockDetailDTO> toList(List<DockWithGPSVO> voList)
{
return INSTANCE.innerToList(voList);
}
}