This commit is contained in:
孙小云 2026-01-20 15:56:42 +08:00
parent b3644698fe
commit 4832c03a3d
2 changed files with 53 additions and 2 deletions

View File

@ -1,5 +1,6 @@
package com.ruoyi.device.service.convert;
import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.domain.model.Dock;
import com.ruoyi.device.service.dto.DockDTO;
import org.springframework.beans.BeanUtils;
@ -9,7 +10,7 @@ import java.util.stream.Collectors;
/**
* 机场Service层转换器
* Service DTO Domain Model
* Service DTO Domain Model API VO
*
* @author ruoyi
* @date 2026-01-16
@ -44,6 +45,34 @@ public class DockServiceConvert
return model;
}
/**
* Model VO
*/
public static DockVO toVO(Dock model)
{
if (model == null)
{
return null;
}
DockVO vo = new DockVO();
BeanUtils.copyProperties(model, vo);
return vo;
}
/**
* DTO VO
*/
public static DockVO toVO(DockDTO dto)
{
if (dto == null)
{
return null;
}
DockVO vo = new DockVO();
BeanUtils.copyProperties(dto, vo);
return vo;
}
/**
* Model List DTO List
*/

View File

@ -3,15 +3,21 @@ package com.ruoyi.device.service.impl;
import com.ruoyi.device.api.domain.DockVO;
import com.ruoyi.device.domain.api.IGroupDomain;
import com.ruoyi.device.domain.api.IDockGroupDomain;
import com.ruoyi.device.domain.api.IDockDomain;
import com.ruoyi.device.domain.model.DockGroup;
import com.ruoyi.device.domain.model.Group;
import com.ruoyi.device.domain.model.Dock;
import com.ruoyi.device.service.api.IGroupService;
import com.ruoyi.device.service.convert.GroupServiceConvert;
import com.ruoyi.device.service.dto.GroupDTO;
import com.ruoyi.device.service.dto.DockDTO;
import com.ruoyi.device.service.convert.DockServiceConvert;
import com.ruoyi.device.api.domain.DockDetailVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.stream.Collectors;
/**
@ -29,6 +35,9 @@ public class GroupServiceImpl implements IGroupService
@Autowired
private IDockGroupDomain dockGroupDomain;
@Autowired
private IDockDomain dockDomain;
@Override
public List<GroupDTO> selectGroupList(GroupDTO groupDTO)
{
@ -106,7 +115,20 @@ public class GroupServiceImpl implements IGroupService
@Override
public List<DockVO> getDocksByGroupId(Long groupId)
{
return null;
DockGroup dockGroupQuery = new DockGroup();
dockGroupQuery.setGroupId(groupId);
List<DockGroup> dockGroupList = dockGroupDomain.selectDockGroupList(dockGroupQuery);
if (dockGroupList == null || dockGroupList.isEmpty())
{
return List.of();
}
return dockGroupList.stream()
.map(DockGroup::getDockId)
.map(dockDomain::selectDockByDockId)
.map(DockServiceConvert::toVO)
.collect(Collectors.toList());
}
@Override