From 612127d7830372cda153b4af4a41c5e3b9f7e4f0 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 29 八月 2024 18:28:32 +0800
Subject: [PATCH] update job scheduler
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 420 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 370 insertions(+), 50 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 48d615c..ef629f5 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,27 +1,41 @@
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 java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import javax.annotation.Resource;
+
+import cn.lihu.jh.module.ecg.Utils;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import cn.lihu.jh.module.ecg.dal.mysql.room.RoomMapper;
-import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.service.room.RoomService;
+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.validation.annotation.Validated;
+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;
+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.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 javax.annotation.Resource;
-
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
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.*;
/**
@@ -33,7 +47,18 @@
@Validated
public class QueueServiceImpl implements QueueService {
- final static Integer MAX_QUEUE_NUM = 3;
+ @Resource
+ private ConfigApi configApi;
+
+ @Resource
+ private ScheduledTaskRegistrar taskRegistrar;
+
+ @Resource
+ private QueueService queueService;
+
+ @Resource
+ private RoomService roomService;
+
@Resource
private queueMapper queueMapper;
@@ -42,7 +67,6 @@
private RoomMapper roomMapper;
AtomicInteger openingFlag = new AtomicInteger(0);
-
AtomicInteger curSeqNum = new AtomicInteger(0);
PriorityBlockingQueue<BedQueueBO> priorityQueue = new PriorityBlockingQueue<>();
@@ -50,6 +74,7 @@
ExecutorService singleThreadExecutor = Executors.newSingleThreadExecutor();
+ Integer queueReadyMax = 0;
@Override
public Integer createqueue(QueueSaveReqVO createReqVO) {
@@ -77,6 +102,263 @@
queueMapper.deleteById(id);
}
+ @Override
+ public ErrorCode startBedOpen(Long roomId, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, bedNo));
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public ErrorCode startBedClose(Long roomId, String bedNo) {
+ Future<ErrorCode> future = singleThreadExecutor.submit( new BedCloseCallable(this, roomId, bedNo));
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public ErrorCode startBedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorPauseCallable(this, roomId, bedNo, docId, docName)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public ErrorCode startBedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorResumeCallable(this, roomId, bedNo, docId, docName)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public ErrorCode startBedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorOnCallable(this, roomId, bedNo, docId, docName)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+ @Override
+ public ErrorCode startBedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
+ Future<ErrorCode> future = singleThreadExecutor.submit(
+ new BedDoctorOffCallable(this, roomId, bedNo, docId, docName)
+ );
+
+ try {
+ ErrorCode ret = future.get();
+ return ret;
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ e.printStackTrace();
+ }
+
+ return ECG_INNER_ERROR;
+ }
+
+
+ /**
+ * 宸插叧闂� 鎴栬�� 鍏抽棴涓紝鍙互寮�閫氬伐浣�
+ * @param roomId
+ * @param bedNo
+ * @return
+ */
+ @Override
+ public ErrorCode bedOpen(Long roomId, String bedNo) {
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.CLOSED);
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
+ BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ List<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
+
+ // 鏂板宸ヤ綅 浼樺厛闃熷垪
+ BedQueueBO bedQueueBO = new BedQueueBO();
+ bedQueueBO.setRoomId(roomId);
+ bedQueueBO.setBedNo(bedNo);
+ bedQueueBO.setMaxQueueNum(queueReadyMax);
+ bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
+ bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
+ priorityQueue.offer(bedQueueBO);
+ mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);
+ return SUCCESS;
+ }
+
+ @Override
+ public ErrorCode bedClose(Long roomId, String bedNo) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO)
+ return QUEUE_BED_ABNORMAL;
+
+ if (bedQueueBO.getQueueNum().get() >0)
+ return QUEUE_HAVE_PATIENT;
+
+ mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
+ priorityQueue.remove(bedQueueBO);
+
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.OPENING);
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.PAUSE);
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
+ BedStatusEnum.CLOSED, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ return SUCCESS;
+ }
+
+ @Override
+ public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO) {
+ return error(QUEUE_BED_ABNORMAL);
+ }
+
+ RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+ if (null == roomDO) {
+ return error(ECG_INNER_ERROR);
+ }
+
+ RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
+ return success(roomRespVO);
+ }
+
+ @Override
+ public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO)
+ return QUEUE_BED_ABNORMAL;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.PAUSE);
+ priorityQueue.remove(bedQueueBO);
+
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName,
+ BedStatusEnum.PAUSE, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ return SUCCESS;
+ }
+
+ @Override
+ public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO)
+ return QUEUE_BED_ABNORMAL;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
+ priorityQueue.offer(bedQueueBO);
+
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.PAUSE);
+ Integer updateNum = roomMapper.setBedDoctorPause(roomId, bedNo, docId, docName,
+ BedStatusEnum.DOCTOR_ON, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ hurryup();
+ return SUCCESS;
+ }
+
+ @Override
+ public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO)
+ return QUEUE_BED_ABNORMAL;
+
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.OPENING);
+ Integer updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName,
+ BedStatusEnum.DOCTOR_ON, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
+
+ return SUCCESS;
+ }
+
+ @Override
+ public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) {
+ BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null == bedQueueBO)
+ return QUEUE_BED_ABNORMAL;
+
+ // DB update
+ List statusList = new ArrayList<BedStatusEnum>();
+ statusList.add(BedStatusEnum.DOCTOR_ON);
+ Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId, docName,
+ BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum )
+ return ROOM_INVALID_STATUS;
+
+ bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
+
+ return SUCCESS;
+ }
+
private void validatequeueExists(Integer id) {
if (queueMapper.selectById(id) == null) {
throw exception(QUEUE_NOT_EXISTS);
@@ -94,14 +376,20 @@
}
/**
- * 绯荤粺閲嶅惎鏃讹紝浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 锛侊紒寮�璇婃湡闂达紝涓嶈兘鎵ц杩欎釜鏂规硶锛屽惁鍒欎細鏈� P0 闂
+ * 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
+ * 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
*/
- public void initQueue() {
+ public void initBedQueueAndSeqNumFromDB() {
priorityQueue.clear();
mapBedVsQueue.clear();
// 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃
- List<RoomDO> roomDOList = roomMapper.simpleRoomList();
+ List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
+ bedStatusEnumList.add(BedStatusEnum.OPENING);
+ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
+ bedStatusEnumList.add(BedStatusEnum.PAUSE);
+ List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
// 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
@@ -110,10 +398,10 @@
List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList);
bedQueueBOList.forEach(item -> {
- item.maxQueueNum = MAX_QUEUE_NUM;
+ item.maxQueueNum = queueReadyMax;
Optional<QueueStatisticDO> queueStatisticDOOptional = queueStatisticDOList.stream().filter(it->it.getRoomId()==item.roomId && it.getBedNo().equals(item.getBedNo())).findFirst();
int queueNum = queueStatisticDOOptional.isPresent() ? queueStatisticDOOptional.get().getTotalInStatus() : 0;
- if ( MAX_QUEUE_NUM < queueNum )
+ if ( queueReadyMax < queueNum )
throw new RuntimeException("init: exceed max queue number!");
item.queueNum.set( queueNum );
@@ -123,24 +411,6 @@
Integer num = queueMapper.getMaxSeqNum();
curSeqNum = new AtomicInteger(null == num ? 0 : num);
- }
-
- /**
- * 杩欎釜閫昏緫 涓嶉渶瑕佷簡
- */
- 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() );
}
/**
@@ -155,7 +425,7 @@
for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
while (bedQueueBO.queueNum.get() < bedQueueBO.maxQueueNum) {
// 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰�
- Integer updateNum = queueMapper.procPassedReturnPatient(
+ Integer updateNum = queueMapper.queuePassedReturnPatient(
bedQueueBO.getRoomId(),
bedQueueBO.getRoomName(),
bedQueueBO.getBedNo(),
@@ -224,12 +494,7 @@
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
- if (0 == openingFlag.get())
- return;
-
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
private void nextPatient(Long roomId, String bedNo) {
@@ -248,9 +513,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
+ startHurryUp();
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -295,22 +558,79 @@
return patientStatisticVO;
}
+ @Override
+ public void setQueueReadyMax(Integer max) {
+ queueReadyMax = max;
+ }
+
public void startBiz() {
+ if (1 == openingFlag.get())
+ return;
+
+ // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
+ queueMapper.clearQueue();
+
+ initBedQueueAndSeqNumFromDB();
+
openingFlag.set(1);
hurryup();
}
+ public void closeBiz() {
+ openingFlag.set(0);
+ }
+
@Override
- public Integer passedPatientReturn(Long roomId, String bedNo, String patId) {
- Integer updateNum = queueMapper.passedPatientReturn(roomId, bedNo, patId,
+ public void resetScheduler() {
+ Set<ScheduledTask> taskList = taskRegistrar.getScheduledTasks();
+ taskList.forEach((task)->task.cancel());
+
+ String strOpenCloseTime = configApi.getConfigValueByKey(ECG_OPENING_TIME_KEY);
+ List<LocalTime> list = Utils.parseOpeningTime(strOpenCloseTime);
+ LocalTime openingTime = list.get(0);
+ LocalTime closeTime = list.get(1);
+ String openCronExpression = String.format("0 %d %d * * ?", openingTime.getMinute(), openingTime.getHour());
+ String closeCronExpression = String.format("0 %d %d * * ?", closeTime.getMinute(), closeTime.getHour());
+
+ String strRoomResetTime = configApi.getConfigValueByKey(ECG_ROOM_RESET_TIME_KEY);
+ LocalTime roomResetTime = Utils.parseTime(strRoomResetTime);
+ String roomResetCronExpression = String.format("0 %d %d * * ?", roomResetTime.getMinute(), roomResetTime.getHour());
+
+ taskRegistrar.scheduleCronTask(new CronTask(() -> {
+ System.out.println("Opening Task executed at: " + System.currentTimeMillis());
+ queueService.startBiz();
+ }, openCronExpression));
+
+ taskRegistrar.scheduleCronTask(new CronTask(() -> {
+ System.out.println("Close Task executed at: " + System.currentTimeMillis());
+ queueService.closeBiz();
+ }, closeCronExpression));
+
+ taskRegistrar.scheduleCronTask(new CronTask(() -> {
+ System.out.println("Room Reset Task executed at: " + System.currentTimeMillis());
+ roomService.resetRoom();
+ }, roomResetCronExpression));
+ }
+
+ @Override
+ public Integer recallPatient(Long roomId, String bedNo, String patId) {
+ Integer updateNum = queueMapper.recallPassedPatient(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