From 4ec8c306229e53951c7cb445f027d3b37f47f742 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 22 八月 2024 14:32:25 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 205 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 137 insertions(+), 68 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 69d68d9..b961cb3 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,12 +1,10 @@
package cn.lihu.jh.module.ecg.service.queue;
+import cn.lihu.jh.module.ecg.dal.dataobject.queue.BedQueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueStatisticDO;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO;
import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
-import lombok.Data;
-import org.jetbrains.annotations.NotNull;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -17,12 +15,10 @@
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
-import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.PriorityBlockingQueue;
+import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import static cn.lihu.jh.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -37,18 +33,23 @@
@Validated
public class QueueServiceImpl implements QueueService {
- final static Integer MAX_QUEUE_NUM = 2;
-
- AtomicInteger curSeqNum = new AtomicInteger(0);
-
- PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
- ConcurrentHashMap<String, BedQueueBO > mapBedVsQueue = new ConcurrentHashMap<>();
+ final static Integer MAX_QUEUE_NUM = 3;
@Resource
private queueMapper queueMapper;
@Resource
private RoomMapper roomMapper;
+
+ AtomicInteger openingFlag = new AtomicInteger(0);
+
+ AtomicInteger curSeqNum = new AtomicInteger(0);
+
+ PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
+ ConcurrentHashMap<String, BedQueueBO > mapBedVsQueue = new ConcurrentHashMap<>();
+
+ ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
+
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -92,39 +93,9 @@
return queueMapper.selectPage(pageReqVO);
}
- @Override
- public List<QueueStatisticDO> queueStatistics(List<Byte> statusList) {
- return queueMapper.queueStatistic(statusList);
- }
-
- @Override
- public void queue(QueueSaveReqVO queueSaveReqVO) {
- BedQueueBO bedQueueBO = priorityQueue.peek();
- if (null == bedQueueBO)
- return;
-
- 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.get() < bedQueueBO.maxQueueNum) {
- queueSaveReqVO.setStatus(QueueStatusEnum.READY.getStatus()); //鍊欒瘖鍑嗗涓�
- queueSaveReqVO.setRoomId(bedQueueBO.getRoomId());
- queueSaveReqVO.setRoomName(bedQueueBO.getRoomName());
- queueSaveReqVO.setBedNo(bedQueueBO.getBedNo());
- queueSaveReqVO.setSeqNum(curSeqNum.get());
- QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
- queueMapper.insert(queue); // queue.getId();
-
- curSeqNum.getAndIncrement();
- bedQueueBO.queueNum.getAndIncrement();
- BedQueueBO bedQueueBO2 = priorityQueue.poll();
- priorityQueue.offer(bedQueueBO2);
- }
-
-
- }
-
+ /**
+ * 绯荤粺閲嶅惎鏃讹紝浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ */
public void initQueue() {
priorityQueue.clear();
mapBedVsQueue.clear();
@@ -133,7 +104,7 @@
List<RoomDO> roomDOList = roomMapper.simpleRoomList();
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
- // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛� 鍒楄〃
+ // 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
@@ -141,15 +112,35 @@
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.set( queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0 );
+ int queueNum = queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0;
+ if ( MAX_QUEUE_NUM < queueNum )
+ throw new RuntimeException("init: exceed max queue number!");
+
+ item.queueNum.set( queueNum );
priorityQueue.offer(item);
mapBedVsQueue.put(String.format("%09d%s", item.roomId, item.bedNo), item);
});
Integer num = queueMapper.getMaxSeqNum();
- curSeqNum = new AtomicInteger(null == num ? 1 : ++num);
+ curSeqNum = new AtomicInteger(null == num ? 0 : num);
+ }
- hurryup();
+ /**
+ * 杩欎釜閫昏緫 涓嶉渶瑕佷簡
+ */
+ 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() );
}
/**
@@ -157,48 +148,126 @@
* 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿�
*/
public void hurryup() {
- while (true) {
+ while (1 == openingFlag.get()) {
BedQueueBO bedQueueBO = priorityQueue.peek();
if (null == bedQueueBO)
return;
- if (bedQueueBO.queueNum.get() == bedQueueBO.maxQueueNum)
+ int curQueueNum = bedQueueBO.queueNum.get();
+ if (curQueueNum > bedQueueBO.maxQueueNum)
+ throw new RuntimeException("hurryup: exceed max queue number!");
+
+ if (curQueueNum == bedQueueBO.maxQueueNum)
return;
- QueueDO queue = queueMapper.getFirstInQueueByStatus(QueueStatusEnum.WAITING.getStatus());
- if (null == queue)
- return;
+ Integer updateNum = queueMapper.preemptPatient(
+ bedQueueBO.getRoomId(),
+ bedQueueBO.getRoomName(),
+ bedQueueBO.getBedNo(),
+ curSeqNum.get() + 1,
+ QueueStatusEnum.WAITING.getStatus(),
+ QueueStatusEnum.READY.getStatus());
- 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();
+ // 娌℃湁鎶㈠埌鎺掗槦鎮ｈ��
+ if (null == updateNum || 0 == updateNum) {
+ return;
+ }
curSeqNum.getAndIncrement();
- bedQueueBO.queueNum.getAndIncrement();
- BedQueueBO bedQueueBO2 = priorityQueue.poll();
- priorityQueue.offer(bedQueueBO2);
+
+ // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊�
+ bedQueueBO.queueNum.incrementAndGet();
+
+ // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡浼樺厛闃熷垪椤哄簭
+ priorityQueue.remove(bedQueueBO);
+ priorityQueue.offer(bedQueueBO);
}
}
- public void nextPatient(Long roomId, String bedNo) {
+ /**
+ * 棰勭害纭鍚庣殑鎺掗槦
+ * @param queueSaveReqVO
+ */
+ @Override
+ public void queue(QueueSaveReqVO queueSaveReqVO) {
+ queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
+ QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
+ queueMapper.insert(queue);
+
+ if (0 == openingFlag.get())
+ return;
+
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
+ }
+
+ private void nextPatient(Long roomId, String bedNo) {
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 灏辫瘖鍑嗗涓殑浜� 璁剧疆涓哄氨璇婁腑
- queueMapper.updateQueueStatus(roomId, bedNo,
+ Integer updateNum = queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
+
+ // 璇ュ伐浣� 娌℃湁 灏辫瘖鍑嗗涓� 浜哄憳
+ if (null == updateNum || 0 == updateNum) {
+ return;
+ }
// 浼樺厛闃熷垪涓� 璇ュ伐浣� 灏辫瘖鍑嗗涓汉鐨勬暟閲� 鍑忎竴
BedQueueBO bo = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
- boolean breturn = priorityQueue.remove(bo);
- bo.queueNum.getAndDecrement();
+ bo.queueNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊�
+ priorityQueue.remove(bo);
priorityQueue.offer(bo);
- hurryup();
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
+ }
+
+ public void finishNextPatient(Long roomId, String bedNo) {
+ // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓哄氨璇婂畬鎴�
+ Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.FINISH.getStatus());
+
+ nextPatient(roomId, bedNo);
+ }
+
+ public void passNextPatient(Long roomId, String bedNo) {
+ // 浠� DB 鎶� 灏辫瘖涓殑浜� 璁剧疆涓鸿繃鍙�
+ Integer ret = queueMapper.updateQueueStatus(roomId, bedNo,
+ QueueStatusEnum.ONSTAGE.getStatus(), QueueStatusEnum.PASSED.getStatus());
+
+ nextPatient(roomId, bedNo);
}
public List<QueueDO> getDoctorQueueByStatus(Long roomId, String bedNo, List<Byte> statusList) {
List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, statusList);
return queueDOList;
}
+
+ public PatientStatisticVO getPatientStatistic(Long roomId, String bedNo) {
+ PatientStatisticVO patientStatisticVO = new PatientStatisticVO();
+ List<BedQueueStatisticDO> bedQueueStatisticDOList = queueMapper.bedQueueStatistic(roomId, bedNo);
+ bedQueueStatisticDOList.forEach(item -> {
+ if (QueueStatusEnum.READY.getStatus() == item.getStatus()) {
+ patientStatisticVO.setReadyNum(item.getTotalInStatus());
+ } else if (QueueStatusEnum.FINISH.getStatus() == item.getStatus()) {
+ patientStatisticVO.setFinishedNum(item.getTotalInStatus());
+ } else if (QueueStatusEnum.PASSED.getStatus() == item.getStatus()) {
+ patientStatisticVO.setPassedNum(item.getTotalInStatus());
+ }
+ });
+
+ List<Byte> statusList = new ArrayList<>();
+ statusList.add(QueueStatusEnum.WAITING.getStatus());
+ Integer num = queueMapper.statusStatistic(statusList);
+ patientStatisticVO.setQueuingNum(num);
+
+ return patientStatisticVO;
+ }
+
+ public void startBiz() {
+ openingFlag.set(1);
+ hurryup();
+ }
+
}
--
Gitblit v1.9.3