From 003513b047fcae16e2125ff7a59e6d46ad048ce4 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 16 十月 2025 18:03:36 +0800
Subject: [PATCH] 代码提交
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
index 68554a7..532d6de 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java
@@ -78,8 +78,13 @@
}
@Override
- public RoomProfile getRoomByIP(String ip) {
- List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
+ public RoomProfile getRoomByIP(String ip, Long roomId) {
+ List<RoomDO> roomDOList = null;
+ if (null != roomId) {
+ roomDOList = roomMapper.selectList(RoomDO::getRoomId, roomId);
+ } else {
+ roomDOList = roomMapper.queueByIp(ip);
+ }
RoomProfile roomProfile = new RoomProfile();
roomProfile.setBedNum( 0 );
@@ -90,10 +95,14 @@
roomProfile.setRoomName(roomDO.getRoomName());
roomProfile.setBedNum( roomProfile.getBedNum() + 1);
+ // 0 妫�鏌� 1 棰嗙敤 2 瑁呮満
+
// 璁＄畻 璇婇棿灞忕被鍨�
if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.NONE.getCallingScreenType()) {
- if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
- roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_ONLY.getCallingScreenType());
+ if ( roomDO.getOpType() == 0 ) {
+ roomProfile.setCallingScreenType(RoomCallingScreenEnum.CHECK_ONLY.getCallingScreenType());
+ } else if ( roomDO.getOpType() == 1 ) {
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_ONLY.getCallingScreenType());
} else if ( roomDO.getOpType() == 2 ) {
roomProfile.setCallingScreenType( RoomCallingScreenEnum.INSTALL_ONLY.getCallingScreenType());
}
@@ -101,15 +110,25 @@
if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
// do nothing
} else if ( roomDO.getOpType() == 2 ) {
- roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType());
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType());
+ }
+ } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.RECEIVE_ONLY.getCallingScreenType()) {
+ if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
+ // do nothing
+ } else if ( roomDO.getOpType() == 2 ) {
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType());
}
} else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.INSTALL_ONLY.getCallingScreenType()) {
- if ( roomDO.getOpType() == 0 || roomDO.getOpType() == 1 ) {
- roomProfile.setCallingScreenType( RoomCallingScreenEnum.HYBRID.getCallingScreenType());
+ if ( roomDO.getOpType() == 0 ) {
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType());
+ } else if ( roomDO.getOpType() == 1 ) {
+ roomProfile.setCallingScreenType( RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType());
} else if ( roomDO.getOpType() == 2 ) {
// do nothing
}
- } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.HYBRID.getCallingScreenType()) {
+ } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.RECEIVE_INSTALL.getCallingScreenType()) {
+ // do nothing
+ } else if (roomProfile.getCallingScreenType() == RoomCallingScreenEnum.CHECK_INSTALL.getCallingScreenType()) {
// do nothing
}
}
@@ -127,7 +146,7 @@
List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
bedStatusEnumList.add(BedStatusEnum.OPENING);
bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
- bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_PAUSE);
return roomMapper.simpleRoomList(bedStatusEnumList);
}
--
Gitblit v1.9.3