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 | 92 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 23 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 537c778..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,35 +1,41 @@
package cn.lihu.jh.module.ecg.service.queue;
+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.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.dataobject.room.RoomResVO;
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 org.springframework.stereotype.Service;
-import org.springframework.validation.annotation.Validated;
-
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.*;
/**
@@ -43,6 +49,16 @@
@Resource
private ConfigApi configApi;
+
+ @Resource
+ private ScheduledTaskRegistrar taskRegistrar;
+
+ @Resource
+ private QueueService queueService;
+
+ @Resource
+ private RoomService roomService;
+
@Resource
private queueMapper queueMapper;
@@ -202,7 +218,7 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.CLOSED);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo,
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
@@ -232,7 +248,6 @@
if (bedQueueBO.getQueueNum().get() >0)
return QUEUE_HAVE_PATIENT;
- BedStatusEnum destStatusEnum = destStatusEnum = BedStatusEnum.CLOSED;
mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
priorityQueue.remove(bedQueueBO);
@@ -241,7 +256,8 @@
statusList.add(BedStatusEnum.OPENING);
statusList.add(BedStatusEnum.DOCTOR_ON);
statusList.add(BedStatusEnum.PAUSE);
- Integer updateNum = roomMapper.setBedStatus(roomId, bedNo, destStatusEnum, statusList);
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
+ BedStatusEnum.CLOSED, statusList);
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
@@ -255,12 +271,12 @@
return error(QUEUE_BED_ABNORMAL);
}
- RoomResVO roomResVO = roomMapper.getRoom(roomId, bedNo, docId);
- if (null == roomResVO) {
+ RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+ if (null == roomDO) {
return error(ECG_INNER_ERROR);
}
- RoomRespVO roomRespVO = BeanUtils.toBean(roomResVO, RoomRespVO.class);
+ RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
return success(roomRespVO);
}
@@ -301,6 +317,7 @@
if ( null==updateNum || 0 == updateNum )
return ROOM_INVALID_STATUS;
+ hurryup();
return SUCCESS;
}
@@ -372,7 +389,7 @@
bedStatusEnumList.add(BedStatusEnum.OPENING);
bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
bedStatusEnumList.add(BedStatusEnum.PAUSE);
- List<RoomResVO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
+ List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList);
List<BedQueueBO> bedQueueBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedQueueBO.class)).toList();
// 浠嶥B 鑾峰彇 闃熷垪涓� 灏辫瘖鍑嗗涓汉鍛樼粺璁� 鍒楄〃
@@ -408,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(),
@@ -476,9 +493,6 @@
queueSaveReqVO.setStatus(QueueStatusEnum.WAITING.getStatus()); //鎺掗槦涓�
QueueDO queue = BeanUtils.toBean(queueSaveReqVO, QueueDO.class);
queueMapper.insert(queue);
-
- if (0 == openingFlag.get())
- return;
startHurryUp();
}
@@ -567,8 +581,40 @@
}
@Override
+ 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.passedPatientReturn(roomId, bedNo, patId,
+ Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
startHurryUp();
return updateNum;
--
Gitblit v1.9.3