From be69c3d9d175027cb8d43f60a7744dc6e8c52433 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 20 八月 2024 15:01:32 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 7fdb051..69d68d9 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
@@ -21,6 +21,9 @@
import javax.annotation.Resource;
import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
@@ -36,9 +39,10 @@
final static Integer MAX_QUEUE_NUM = 2;
- Integer curSeqNum = 0;
+ AtomicInteger curSeqNum = new AtomicInteger(0);
- PriorityQueue<BedQueueBO> priorityQueue = new PriorityQueue<>();
+ PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
+ ConcurrentHashMap<String, BedQueueBO > mapBedVsQueue = new ConcurrentHashMap<>();
@Resource
private queueMapper queueMapper;
@@ -99,21 +103,21 @@
if (null == bedQueueBO)
return;
- if (bedQueueBO.queueNum == bedQueueBO.maxQueueNum) {
+ if (bedQueueBO.queueNum.get() == 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) {
+ } else if (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
queueSaveReqVO.setStatus(QueueStatusEnum.READY.getStatus()); //鍊欒瘖鍑嗗涓�
queueSaveReqVO.setRoomId(bedQueueBO.getRoomId());
queueSaveReqVO.setRoomName(bedQueueBO.getRoomName());
queueSaveReqVO.setBedNo(bedQueueBO.getBedNo());
- queueSaveReqVO.setSeqNum(curSeqNum);
+ queueSaveReqVO.setSeqNum(curSeqNum.get());
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue); // queue.getId();
- curSeqNum++;
- bedQueueBO.queueNum++;
+ curSeqNum.getAndIncrement();
+ bedQueueBO.queueNum.getAndIncrement();
BedQueueBO bedQueueBO2 = priorityQueue.poll();
priorityQueue.offer(bedQueueBO2);
}
@@ -121,13 +125,15 @@
}
- @PostConstruct
public void initQueue() {
priorityQueue.clear();
+ mapBedVsQueue.clear();
+ // 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃
List<RoomDO> roomDOList = roomMapper.simpleRoomList();
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
+ // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛� 鍒楄〃
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
@@ -135,12 +141,15 @@
bedQueueBOList.forEach(item -> {
item.maxQueueNum = MAX_QUEUE_NUM;
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;
+ item.queueNum.set( queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0 );
priorityQueue.offer(item);
+ mapBedVsQueue.put(String.format("%09d%s", item.roomId, item.bedNo), item);
});
- curSeqNum = queueMapper.getMaxSeqNum();
- curSeqNum = null == curSeqNum ? 1 : ++curSeqNum;
+ Integer num = queueMapper.getMaxSeqNum();
+ curSeqNum = new AtomicInteger(null == num ? 1 : ++num);
+
+ hurryup();
}
/**
@@ -148,5 +157,48 @@
* 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
*/
public void hurryup() {
+ while (true) {
+ BedQueueBO bedQueueBO = priorityQueue.peek();
+ if (null == bedQueueBO)
+ return;
+
+ if (bedQueueBO.queueNum.get() == bedQueueBO.maxQueueNum)
+ return;
+
+ QueueDO queue = queueMapper.getFirstInQueueByStatus(QueueStatusEnum.WAITING.getStatus());
+ if (null == queue)
+ return;
+
+ queue.setStatus(QueueStatusEnum.READY.getStatus()); //鍊欒瘖鍑嗗涓�
+ queue.setRoomId(bedQueueBO.getRoomId());
+ queue.setRoomName(bedQueueBO.getRoomName());
+ queue.setBedNo(bedQueueBO.getBedNo());
+ queue.setSeqNum(curSeqNum.get());
+ queueMapper.updateById(queue); // queue.getId();
+
+ curSeqNum.getAndIncrement();
+ bedQueueBO.queueNum.getAndIncrement();
+ BedQueueBO bedQueueBO2 = priorityQueue.poll();
+ priorityQueue.offer(bedQueueBO2);
+ }
+ }
+
+ public void nextPatient(Long roomId, String bedNo) {
+ // 浠� DB 鎶� 搴忓彿鏈�灏忕殑 灏辫瘖鍑嗗涓殑浜� 璁剧疆涓哄氨璇婁腑
+ queueMapper.updateQueueStatus(roomId, bedNo,
+ QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
+
+ // 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
+ BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ boolean breturn = priorityQueue.remove(bo);
+ bo.queueNum.getAndDecrement();
+ priorityQueue.offer(bo);
+
+ hurryup();
+ }
+
+ public List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
+ List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, statusList);
+ return queueDOList;
}
}
--
Gitblit v1.9.3