From a47e5cd452a405463c03d1d8c4f97884123a46b2 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 04 九月 2024 11:41:33 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java index 937ec3e..695c8a4 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java @@ -5,8 +5,10 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; +import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants; @@ -227,8 +229,12 @@ } @Override - public Integer getOpeningFlag() { - return openingFlag.get(); + public MonitorInfoVO getMonitorInfo() { + MonitorInfoVO monitorInfoVO = new MonitorInfoVO(); + monitorInfoVO.setOpeningFlag( openingFlag.get() ); + monitorInfoVO.setQueueNum( mapBedVsQueue.size() ); + monitorInfoVO.setActiveQueueNum( priorityQueue.size() ); + return monitorInfoVO; } /** @@ -650,6 +656,7 @@ public void closeBiz() { openingFlag.set(0); + startBedReload(); } @Override @@ -673,4 +680,23 @@ + " opening " + openingFlag.get()); } + @Override + public List<QueueDO> callingData(Integer waitingNum, Integer passedNum) { + //queueMapper. + return null; + } + + @Override + public List<QueueDO> getRoomQueue(String ip, List<Byte> statusList) { + List<RoomDO> roomDOList = roomMapper.queueByIp(ip); + Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst(); + if (!optionalQueueDO.isPresent()) { + return new ArrayList<QueueDO>(); + } + + Long roomId = optionalQueueDO.get().getRoomId(); + List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList); + return queueDOList; + } + } -- Gitblit v1.9.3