From c475f2545f477846e984c051f10a4b7ea6b64d02 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 15 八月 2024 17:56:16 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 5b558c7..7fdb051 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
@@ -20,9 +20,7 @@
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.PriorityQueue;
+import java.util.*;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
@@ -98,32 +96,57 @@
@Override
public void queue(QueueSaveReqVO queueSaveReqVO) {
BedQueueBO bedQueueBO = priorityQueue.peek();
+ if (null == bedQueueBO)
+ return;
+
if (bedQueueBO.queueNum == bedQueueBO.maxQueueNum) {
queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
+ QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
+ queueMapper.insert(queue); // queue.getId();
} else if (bedQueueBO.queueNum < bedQueueBO.maxQueueNum) {
queueSaveReqVO.setStatus(QueueStatusEnum.READY.getStatus()); //鍊欒瘖鍑嗗涓�
- queueSaveReqVO.setRoomNum(bedQueueBO.getRoomName());
- queueSaveReqVO.setBedNum(bedQueueBO.getBedNo());
- queueSaveReqVO.setSeqNum(curSeqNum++);
+ queueSaveReqVO.setRoomId(bedQueueBO.getRoomId());
+ queueSaveReqVO.setRoomName(bedQueueBO.getRoomName());
+ queueSaveReqVO.setBedNo(bedQueueBO.getBedNo());
+ queueSaveReqVO.setSeqNum(curSeqNum);
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue); // queue.getId();
+ curSeqNum++;
bedQueueBO.queueNum++;
+ BedQueueBO bedQueueBO2 = priorityQueue.poll();
+ priorityQueue.offer(bedQueueBO2);
}
+
+
}
@PostConstruct
- private void initQueue() {
+ public void initQueue() {
+ priorityQueue.clear();
+
List<RoomDO> roomDOList = roomMapper.simpleRoomList();
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
+ List<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
+
bedQueueBOList.forEach(item -> {
item.maxQueueNum = MAX_QUEUE_NUM;
- item.queueNum = 0;
- priorityQueue.add(item);
+ Optional<QueueStatisticDO> queueStatisticDOOptional = queueStatisticDOList.stream().filter(it->it.getRoomId()==item.roomId && it.getBedNo().equals(item.getBedNo())).findFirst();
+ item.queueNum = queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0;
+ priorityQueue.offer(item);
});
curSeqNum = queueMapper.getMaxSeqNum();
+ curSeqNum = null == curSeqNum ? 1 : ++curSeqNum;
+ }
+
+ /**
+ * TODO 鏂板紑闃熷垪鏃讹紝闇�瑕佹妸鎺掗槦涓殑浜� 杞埌 灏辫瘖鍑嗗 鐘舵��
+ * 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
+ */
+ public void hurryup() {
}
}
-
--
Gitblit v1.9.3