From 0fa1f4767affcd1879709ebea630016356836c75 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 18 九月 2026 15:07:20 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/ecg
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java | 8 +++-----
1 files changed, 3 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 c218f74..b42fa27 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
@@ -7,7 +7,7 @@
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.RoomDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomProfile;
/**
@@ -47,7 +47,7 @@
*/
RoomDO getRoom(Integer id);
- RoomDO getRoomByIP(String ip);
+ RoomProfile getRoomByIP(String ip, Long roomId);
/**
* 鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉
@@ -57,11 +57,9 @@
*/
PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO);
- List<RoomStatisticsDO> roomStatistics();
-
List<RoomDO> simpleRoomList();
- void resetRoom();
+ void resetRoom(Boolean needCloseBed);
MonitorInfoVO getMonitorInfo();
--
Gitblit v1.9.3