From f696df5ce36beb3af261bae782fa0a418b83b9e6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 23 八月 2024 15:41:18 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 104 +++++++++++++++++++++++++++++-----------------------
1 files changed, 58 insertions(+), 46 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 16d2883..c16b26d 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
@@ -94,9 +94,11 @@
}
/**
- * 绯荤粺閲嶅惎鏃讹紝浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 锛侊紒寮�璇婃湡闂达紝涓嶈兘鎵ц杩欎釜鏂规硶锛屽惁鍒欎細鏈� P0 闂
+ * 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
*/
- public void initQueue() {
+ public void initBedQueueAndSeqNumFromDB() {
priorityQueue.clear();
mapBedVsQueue.clear();
@@ -126,29 +128,40 @@
}
/**
- * 杩欎釜閫昏緫 涓嶉渶瑕佷簡
- */
- public void reorderQueue() {
- // 鏍规嵁棰勭害鍓嶅悗锛屼粠DB 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛� 鍒楄〃
- List<Byte> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- List<QueueDO> queueDOList = queueMapper.getOrderedQueue(queueStatusList);
- if (queueDOList.isEmpty())
- return;
-
- AtomicInteger seqNum = new AtomicInteger(1);
- queueDOList.forEach(item -> {item.setSeqNum(seqNum.getAndIncrement());});
- queueMapper.updateBatch(queueDOList);
-
- curSeqNum.set( seqNum.get() );
- }
-
- /**
* TODO 鏂板紑闃熷垪鏃讹紝闇�瑕佹妸鎺掗槦涓殑浜� 杞埌 灏辫瘖鍑嗗 鐘舵��
* 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
*/
public void hurryup() {
- while (1 == openingFlag.get()) {
+ if (0 == openingFlag.get())
+ return;
+
+ // 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
+ for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
+ while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
+ // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
+ Integer updateNum = queueMapper.procPassedReturnPatient(
+ bedQueueBO.getRoomId(),
+ bedQueueBO.getRoomName(),
+ bedQueueBO.getBedNo(),
+ curSeqNum.get() + 1,
+ QueueStatusEnum.PASSED_RETURN.getStatus(),
+ QueueStatusEnum.READY.getStatus());
+ if (null == updateNum || 0 == updateNum)
+ break;
+
+ curSeqNum.getAndIncrement();
+
+ // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
+ bedQueueBO.queueNum.incrementAndGet();
+
+ // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡浼樺厛闃熷垪椤哄簭
+ priorityQueue.remove(bedQueueBO);
+ priorityQueue.offer(bedQueueBO);
+ }
+ }
+
+ // 澶勭悊 鎺掗槦涓� 鎮ｈ��
+ while (true) {
BedQueueBO bedQueueBO = priorityQueue.peek();
if (null == bedQueueBO)
return;
@@ -160,18 +173,8 @@
if (curQueueNum == bedQueueBO.maxQueueNum)
return;
- // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.procPassedReturnPatient(
- bedQueueBO.getRoomId(),
- bedQueueBO.getRoomName(),
- bedQueueBO.getBedNo(),
- curSeqNum.get() + 1,
- QueueStatusEnum.PASSED_RETURN.getStatus(),
- QueueStatusEnum.READY.getStatus());
-
- if (null == updateNum || 0 == updateNum) {
- // 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
- updateNum = queueMapper.preemptPatient(
+ // 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰�
+ Integer updateNum = queueMapper.preemptPatient(
bedQueueBO.getRoomId(),
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
@@ -179,10 +182,9 @@
QueueStatusEnum.WAITING.getStatus(),
QueueStatusEnum.READY.getStatus());
- // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
- if (null == updateNum || 0 == updateNum) {
- return;
- }
+ // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
+ if (null == updateNum || 0 == updateNum) {
+ return;
}
curSeqNum.getAndIncrement();
@@ -209,9 +211,7 @@
if (0 == openingFlag.get())
return;
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
private void nextPatient(Long roomId, String bedNo) {
@@ -230,9 +230,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -278,21 +276,35 @@
}
public void startBiz() {
+ // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
+ queueMapper.clearQueue();
+
+ initBedQueueAndSeqNumFromDB();
+
openingFlag.set(1);
hurryup();
}
@Override
- public Integer passedPatientReturn(Long roomId, String bedNo, String patId) {
+ public Integer recallPatient(Long roomId, String bedNo, String patId) {
Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
+ startHurryUp();
return updateNum;
}
@Override
- public Integer queueJump(String patId, Byte jumped) {
+ public Integer patientJump(String patId, Byte jumped) {
Integer updateNum = queueMapper.queueJump(patId, QueueStatusEnum.WAITING.getStatus(), jumped);
- return null;
+ startHurryUp();
+ return updateNum;
+ }
+
+ private void startHurryUp() {
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
}
}
+
--
Gitblit v1.9.3