From 347f8c9cf8c75e420125715e0b08fcf4f6978eeb Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 02 九月 2024 11:27:39 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 103 +++++++++++++++++----------------------------------
1 files changed, 35 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 8a84085..937ec3e 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,23 +1,16 @@
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.framework.common.exception.enums.GlobalErrorCodeConstants;
-import cn.lihu.jh.module.ecg.Utils;
-import cn.lihu.jh.module.ecg.config.DynamicSchedulingConfig;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
-import cn.lihu.jh.module.ecg.service.room.RoomService;
import lombok.extern.slf4j.Slf4j;
-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.enums.GlobalErrorCodeConstants;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
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;
@@ -26,19 +19,15 @@
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 static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*;
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.*;
/**
* 鎺掗槦 Service 瀹炵幇绫�
@@ -49,12 +38,6 @@
@Validated
@Slf4j
public class QueueServiceImpl implements QueueService {
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private RoomService roomService;
@Resource
private queueMapper queueMapper;
@@ -227,6 +210,26 @@
return ECG_INNER_ERROR;
}
+ @Override
+ public void startHurryUp() {
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
+ }
+
+ @Override
+ public void startBedReload() {
+ singleThreadExecutor.execute( () -> {
+ bedReload();
+ hurryup();
+ monitorInfo();
+ });
+ }
+
+ @Override
+ public Integer getOpeningFlag() {
+ return openingFlag.get();
+ }
/**
* 宸插叧闂� 鎴栬�� 鍏抽棴涓紝鍙互寮�閫氬伐浣�
@@ -245,7 +248,7 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.CLOSED);
- Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo, BedStatusEnum.OPENING, statusList);
+ Integer updateNum = roomMapper.setBedOpeningOpening(roomId, bedNo, BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum ) {
log.error("bedOpen DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
@@ -404,10 +407,21 @@
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
+ statusList.add(BedStatusEnum.PAUSE);
Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId, BedStatusEnum.OPENING, statusList);
if ( null==updateNum || 0 == updateNum ) {
log.error("bedDoctorOff DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
+ }
+
+ // 濡傛灉鏄湪 PAUSE 鐘舵�佺搴х殑锛岄渶瑕侀噸鏂板姞鍥� 浼樺厛闃熷垪
+ if (bedQueueBO.getStatus().equals(BedStatusEnum.PAUSE.getStatus())) {
+ if (!priorityQueue.contains(bedQueueBO)) {
+ priorityQueue.offer(bedQueueBO);
+ } else {
+ log.error("bedDoctorResume priorityQueue still exist!. " + roomId + " " + bedNo);
+ return ECG_INNER_ERROR;
+ }
}
bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
@@ -639,40 +653,6 @@
}
@Override
- public void resetScheduler() {
- ScheduledTaskRegistrar taskRegistrar = DynamicSchedulingConfig.static_scheduledTaskRegistrar;
- taskRegistrar.getScheduledTasks().forEach(ScheduledTask::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());
- startBiz();
- }, openCronExpression));
-
- taskRegistrar.scheduleCronTask(new CronTask(() -> {
- System.out.println("Close Task executed at: " + System.currentTimeMillis());
- closeBiz();
- }, closeCronExpression));
-
- taskRegistrar.scheduleCronTask(new CronTask(() -> {
- System.out.println("Room Reset Task executed at: " + System.currentTimeMillis());
- roomService.resetRoom();
- }, roomResetCronExpression));
-
- taskRegistrar.afterPropertiesSet();
- }
-
- @Override
public Integer recallPatient(Long roomId, String bedNo, String patId) {
Integer updateNum = queueMapper.recallPassedPatient(roomId, bedNo, patId,
QueueStatusEnum.PASSED.getStatus(), QueueStatusEnum.PASSED_RETURN.getStatus());
@@ -691,19 +671,6 @@
public void monitorInfo() {
log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size()
+ " opening " + openingFlag.get());
- }
-
- private void startHurryUp() {
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
- }
-
- private void startBedReload() {
- singleThreadExecutor.execute( () -> {
- bedReload();
- hurryup();
- });
}
}
--
Gitblit v1.9.3