From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期四, 12 十二月 2024 19:47:57 +0800 Subject: [PATCH] 工位选择界面 诊室按照room id排序 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java index 110e177..e67ed46 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java @@ -1,13 +1,14 @@ package cn.lihu.jh.module.ecg.service.room; import java.util.*; +import javax.validation.Valid; import cn.lihu.jh.framework.common.pojo.PageResult; +import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO; -import javax.validation.Valid; /** * 璇婂鍜岃瘖鐤楀簥 Service 鎺ュ彛 @@ -44,7 +45,9 @@ * @param id 缂栧彿 * @return 璇婂鍜岃瘖鐤楀簥 */ - RoomResVO getRoom(Integer id); + RoomDO getRoom(Integer id); + + RoomDO getRoomByIP(String ip); /** * 鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉 @@ -52,10 +55,14 @@ * @param pageReqVO 鍒嗛〉鏌ヨ * @return 璇婂鍜岃瘖鐤楀簥鍒嗛〉 */ - PageResult<RoomResVO> getRoomPage(RoomPageReqVO pageReqVO); + PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO); List<RoomStatisticsDO> roomStatistics(); - List<RoomResVO> simpleRoomList(); + List<RoomDO> simpleRoomList(); + + void resetRoom(Boolean needCloseBed); + + MonitorInfoVO getMonitorInfo(); } \ No newline at end of file -- Gitblit v1.9.3