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

修改convert

This commit is contained in:
孙小云 2026-01-21 14:04:29 +08:00
parent 215c2f1558
commit 749b8e87dd
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,10 @@ 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.DockVO;
import com.ruoyi.device.api.domain.GroupCreateRequest; import com.ruoyi.device.api.domain.GroupCreateRequest;
import com.ruoyi.device.api.domain.GroupVO;
import com.ruoyi.device.api.domain.SwitchDockGroupRequest; 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.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;
import com.ruoyi.device.service.dto.DockDetailDTO; import com.ruoyi.device.service.dto.DockDetailDTO;
@ -101,9 +103,9 @@ public class GroupController extends BaseController
*/ */
//@InnerAuth //@InnerAuth
@GetMapping("/list") @GetMapping("/list")
public R<List<Long>> getAllGroupIds() public R<List<GroupVO>> getAllGroupIds()
{ {
List<Long> groupIds = groupService.getAllGroupIds(); List<GroupDTO> groupIds = groupService.getAllGroupIds();
return R.ok(groupIds); return R.ok(GroupVOConvert.fromList(groupIds));
} }
} }

2
src/main/java/com/ruoyi/device/service/api/IGroupService.java
View File

@ -98,5 +98,5 @@ public interface IGroupService
* *
* @return 分组ID列表 * @return 分组ID列表
*/ */
List<Long> getAllGroupIds(); List<GroupDTO> getAllGroupIds();
} }

4
src/main/java/com/ruoyi/device/service/impl/GroupServiceImpl.java
View File

@ -128,9 +128,9 @@ public class GroupServiceImpl implements IGroupService
} }
@Override @Override
public List<Long> getAllGroupIds() public List<GroupDTO> getAllGroupIds()
{ {
List<Group> groupList = groupDomain.selectGroupList(new Group()); List<Group> groupList = groupDomain.selectGroupList(new Group());
return groupList.stream().map(Group::getGroupId).toList(); return GroupDTOConvert.fromList(groupList);
} }
} }