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

Compare commits

base: THENG:31454217ea9b6e7f31cd83584244dbfffac0b067
Branches Tags
THENG:main
THENG:test
THENG:dev
THENG:f_add_shuxing
THENG:f_open_all
THENG:release
THENG:model
..
compare: THENG:9bee1836ddf0a93952c8ecc5910661b99e32a5fa
Branches Tags
THENG:test
THENG:dev
THENG:f_add_shuxing
THENG:f_open_all
THENG:main
THENG:release
THENG:model

No commits in common. "31454217ea9b6e7f31cd83584244dbfffac0b067" and "9bee1836ddf0a93952c8ecc5910661b99e32a5fa" have entirely different histories.
31454217ea ... 9bee1836dd

3 changed files with 9 additions and 60 deletions
Show Stats Expand all files Collapse all files

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

@ -6,8 +6,6 @@ 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;
@ -94,7 +92,7 @@ public class DockController extends BaseController
*/ */
//@InnerAuth //@InnerAuth
@GetMapping("/list") @GetMapping("/list")
public R<List<DockWithGPSVO>> getAllDocks() public R<List<DockVO>> 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<>();
@ -102,6 +100,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(DockWithGPSVOConvert.fromList(dtoList)); return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList));
} }
} }

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

@ -2,9 +2,12 @@ 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.*; import com.ruoyi.device.api.domain.DockVO;
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;
@ -99,7 +102,7 @@ public class GroupController extends BaseController
*/ */
//@InnerAuth //@InnerAuth
@GetMapping("/docks/{groupId}") @GetMapping("/docks/{groupId}")
public R<List<DockWithGPSVO>> getDocksByGroupId(@PathVariable("groupId") Long groupId) public R<List<DockVO>> 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);
@ -109,7 +112,7 @@ public class GroupController extends BaseController
dtoList.add(dockDetailDTO); dtoList.add(dockDetailDTO);
} }
return R.ok(DockWithGPSVOConvert.fromList(dtoList)); return R.ok(DockVOConvert.fromDockDetailDTOList(dtoList));
} }
/** /**

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

@ -1,52 +0,0 @@
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);
}
}