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 | 49 +++++++++++++++++++++++++++++++++++-------------- 1 files changed, 35 insertions(+), 14 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 95713d6..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 @@ -1,23 +1,18 @@ package cn.lihu.jh.module.ecg.service.queue; -import java.time.LocalTime; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; import javax.annotation.Resource; -import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants; -import cn.lihu.jh.module.ecg.Utils; -import cn.lihu.jh.module.ecg.config.DynamicSchedulingConfig; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; -import cn.lihu.jh.module.ecg.service.room.RoomService; +import cn.lihu.jh.module.ecg.controller.admin.room.vo.MonitorInfoVO; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.config.CronTask; -import org.springframework.scheduling.config.ScheduledTask; -import org.springframework.scheduling.config.ScheduledTaskRegistrar; 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; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; import cn.lihu.jh.framework.common.exception.ErrorCode; import cn.lihu.jh.framework.common.pojo.CommonResult; import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO; @@ -26,19 +21,15 @@ import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper; import cn.lihu.jh.module.ecg.enums.BedStatusEnum; import cn.lihu.jh.module.ecg.enums.QueueStatusEnum; -import cn.lihu.jh.module.infra.api.config.ConfigApi; import cn.lihu.jh.module.ecg.controller.admin.queue.vo.*; import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO; import cn.lihu.jh.framework.common.pojo.PageResult; import cn.lihu.jh.framework.common.util.object.BeanUtils; import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper; - +import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.lihu.jh.framework.common.pojo.CommonResult.error; import static cn.lihu.jh.framework.common.pojo.CommonResult.success; -import static cn.lihu.jh.module.ecg.Constants.ECG_OPENING_TIME_KEY; -import static cn.lihu.jh.module.ecg.Constants.ECG_ROOM_RESET_TIME_KEY; -import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; /** * 鎺掗槦 Service 瀹炵幇绫� @@ -233,7 +224,17 @@ singleThreadExecutor.execute( () -> { bedReload(); hurryup(); + monitorInfo(); }); + } + + @Override + public MonitorInfoVO getMonitorInfo() { + MonitorInfoVO monitorInfoVO = new MonitorInfoVO(); + monitorInfoVO.setOpeningFlag( openingFlag.get() ); + monitorInfoVO.setQueueNum( mapBedVsQueue.size() ); + monitorInfoVO.setActiveQueueNum( priorityQueue.size() ); + return monitorInfoVO; } /** @@ -655,6 +656,7 @@ public void closeBiz() { openingFlag.set(0); + startBedReload(); } @Override @@ -678,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