From e458133f5db4afe2e497af8ac3e1fc29bbc979aa Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 27 九月 2024 14:52:29 +0800
Subject: [PATCH] bug fix : 开启工位 提示工位队列已经存在
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 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 42a7710..398650b 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
@@ -4,9 +4,13 @@
import javax.annotation.Resource;
import cn.lihu.jh.framework.common.pojo.PageResult;
-import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import cn.lihu.jh.module.ecg.service.queue.QueueService;
+import cn.lihu.jh.module.system.api.oauth2.OAuth2TokenApi;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
@@ -30,6 +34,12 @@
@Resource
private RoomMapper roomMapper;
+
+ @Resource
+ private OAuth2TokenApi oAuth2TokenApi;
+
+ @Resource
+ QueueService queueService;
@Override
public Integer createRoom(RoomSaveReqVO createReqVO) {
@@ -69,6 +79,17 @@
}
@Override
+ public RoomDO getRoomByIP(String ip) {
+ List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
+ Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
+ if (!optionalQueueDO.isPresent()) {
+ return null;
+ }
+
+ return optionalQueueDO.get();
+ }
+
+ @Override
public PageResult<RoomDO> getRoomPage(RoomPageReqVO pageReqVO) {
return roomMapper.selectPage(pageReqVO);
}
@@ -86,4 +107,14 @@
bedStatusEnumList.add(BedStatusEnum.PAUSE);
return roomMapper.simpleRoomList(bedStatusEnumList);
}
+
+ @Override
+ public void resetRoom() {
+ queueService.startResetRoom();
+ }
+
+ @Override
+ public MonitorInfoVO getMonitorInfo() {
+ return queueService.getMonitorInfo();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3