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/RoomServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 14 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 f630467..c6d02df 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
@@ -1,23 +1,27 @@
package cn.lihu.jh.module.ecg.service.room;
+import java.util.*;
+import javax.annotation.Resource;
+
+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.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;
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.RoomStatisticsDO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.BedStatusEnum;
-import org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
-import java.util.*;
-import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-
-import javax.annotation.Resource;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.ROOM_NOT_EXISTS;
-
/**
* 璇婂鍜岃瘖鐤楀簥 Service 瀹炵幇绫�
@@ -31,10 +35,16 @@
@Resource
private RoomMapper roomMapper;
+ @Resource
+ private OAuth2TokenApi oAuth2TokenApi;
+
+ @Resource
+ QueueService queueService;
+
@Override
public Integer createRoom(RoomSaveReqVO createReqVO) {
// 鎻掑叆
- RoomResVO room = BeanUtils.toBean(createReqVO, RoomResVO.class);
+ RoomDO room = BeanUtils.toBean(createReqVO, RoomDO.class);
roomMapper.insert(room);
// 杩斿洖
return room.getId();
@@ -45,7 +55,7 @@
// 鏍￠獙瀛樺湪
validateRoomExists(updateReqVO.getId());
// 鏇存柊
- RoomResVO updateObj = BeanUtils.toBean(updateReqVO, RoomResVO.class);
+ RoomDO updateObj = BeanUtils.toBean(updateReqVO, RoomDO.class);
roomMapper.updateById(updateObj);
}
@@ -64,12 +74,23 @@
}
@Override
- public RoomResVO getRoom(Integer id) {
+ public RoomDO getRoom(Integer id) {
return roomMapper.selectById(id);
}
@Override
- public PageResult<RoomResVO> getRoomPage(RoomPageReqVO pageReqVO) {
+ 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);
}
@@ -79,11 +100,21 @@
}
@Override
- public List<RoomResVO> simpleRoomList() {
+ public List<RoomDO> simpleRoomList() {
List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
bedStatusEnumList.add(BedStatusEnum.OPENING);
bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
bedStatusEnumList.add(BedStatusEnum.PAUSE);
return roomMapper.simpleRoomList(bedStatusEnumList);
}
+
+ @Override
+ public void resetRoom(Boolean needCloseBed) {
+ queueService.startResetRoom(needCloseBed);
+ }
+
+ @Override
+ public MonitorInfoVO getMonitorInfo() {
+ return queueService.getMonitorInfo();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3