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 | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 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 cb0abad..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
@@ -1,10 +1,13 @@
package cn.lihu.jh.module.ecg.controller.admin.room;
+import cn.lihu.jh.framework.common.enums.CommonStatusEnum;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
import cn.lihu.jh.module.ecg.service.room.RoomService;
+import cn.lihu.jh.module.system.api.dept.DeptApi;
+import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -15,6 +18,7 @@
import java.util.*;
import java.io.IOException;
+import java.util.stream.Collectors;
import cn.lihu.jh.framework.common.pojo.PageParam;
import cn.lihu.jh.framework.common.pojo.PageResult;
@@ -41,6 +45,9 @@
@Resource
private RoomService roomService;
+
+ @Resource
+ private DeptApi deptApi;
@PostMapping("/create")
@Operation(summary = "鍒涘缓璇婂鍜岃瘖鐤楀簥")
@@ -96,4 +103,58 @@
BeanUtils.toBean(list, RoomRespVO.class));
}
-}
\ No newline at end of file
+ @GetMapping(value = {"/list-all-simple", "/simple-list"})
+ @Operation(summary = "鑾峰彇閮ㄩ棬绮剧畝淇℃伅鍒楄〃", description = "鍙寘鍚寮�鍚殑閮ㄩ棬锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
+ public CommonResult<List<RoomRespVO>> getSimpleDeptList() {
+
+ List<DeptRespDTO> deptRespDTOList = deptApi.getSimpleDeptList();
+ Optional<DeptRespDTO> ecgDept = deptRespDTOList.stream()
+ .filter(a -> a.getName().equals("ECG"))
+ .findAny();
+
+ List<DeptRespDTO> list2 = new ArrayList<DeptRespDTO>();
+ if (ecgDept.isPresent()){
+ System.out.println(ecgDept.get().getName());
+
+ list2 = deptRespDTOList.stream()
+ .filter(a -> Objects.equals(a.getParentId(), ecgDept.get().getId()))
+ .toList();
+ list2.forEach(System.out::println);
+ list2.size();
+ }
+
+ List<RoomRespVO> list3 = list2.stream().map(item -> {
+ RoomRespVO roomRespVO = new RoomRespVO();
+ roomRespVO.setRoomId( item.getId() );
+ roomRespVO.setRoomName( item.getName() );
+ return roomRespVO;
+ }).toList();
+
+ //return success(BeanUtils.toBean(list2, RoomRespVO.class));
+ return success(list3);
+ }
+
+ @GetMapping(value = {"/list-all-bed"})
+ @Operation(summary = "鑾峰彇璇婂簥鍒楄〃", description = "涓昏鐢ㄤ簬鍓嶇鐨勫紑璇婄鐞�")
+ public CommonResult<Map<String, List<RoomRespVO>>> getAllBedMap() {
+
+ RoomPageReqVO pageReqVO = new RoomPageReqVO();
+ pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+ List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList();
+
+ List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
+
+ 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<Map<String, List<RoomRespVO>>> getSimpleRoomList() {
+ List<RoomDO> list = roomService.simpleRoomList();
+ 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