From f696df5ce36beb3af261bae782fa0a418b83b9e6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 15:41:18 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
index fe1f1d8..c52395f 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -136,7 +136,7 @@
@GetMapping(value = {"/list-all-bed"})
@Operation(summary = "鑾峰彇璇婂簥鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勫紑璇婄鐞�")
- public CommonResult<Map<Long, List<RoomRespVO>>> getAllBedMap() {
+ public CommonResult<Map<String, List<RoomRespVO>>> getAllBedMap() {
RoomPageReqVO pageReqVO = new RoomPageReqVO();
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
@@ -144,14 +144,17 @@
List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
- Map<Long, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomId));
+ Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
return success(map);
}
@GetMapping(value = {"/list-simple-room"})
@Operation(summary = "鑾峰彇闂ㄨ瘖瀹ゅ垪琛�", description = "涓昏鐢ㄤ簬鍓嶇鐨勮瘖瀹ら�夋嫨")
- public CommonResult<List<RoomRespVO>> getSimpleRoomList() {
+ public CommonResult<Map<String, List<RoomRespVO>>> getSimpleRoomList() {
List<RoomDO> list = roomService.simpleRoomList();
- return success(BeanUtils.toBean(list, RoomRespVO.class));
+ List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
+
+ Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
+ return success(map);
}
}
--
Gitblit v1.9.3