From 7660fe12273a6b132256a2fa83ca1b11d6b2381f Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 13 八月 2024 17:48:44 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 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..16a608f 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; @@ -41,6 +44,9 @@ @Resource private RoomService roomService; + + @Resource + private DeptApi deptApi; @PostMapping("/create") @Operation(summary = "鍒涘缓璇婂鍜岃瘖鐤楀簥") @@ -96,4 +102,35 @@ BeanUtils.toBean(list, RoomRespVO.class)); } + @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); + } + } \ No newline at end of file -- Gitblit v1.9.3