From 25ef09df68cd79b9c75bb88ee8ee039b58ce5690 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 22:20:06 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 119 ++++++++++++++++++++++-------------------------------------
1 files changed, 45 insertions(+), 74 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 5c8b473..95713d6 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
@@ -6,6 +6,7 @@
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;
@@ -32,7 +33,6 @@
import cn.lihu.jh.framework.common.util.object.BeanUtils;
import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
-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;
@@ -49,12 +49,6 @@
@Validated
@Slf4j
public class QueueServiceImpl implements QueueService {
-
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private RoomService roomService;
@Resource
private queueMapper queueMapper;
@@ -227,6 +221,20 @@
return ECG_INNER_ERROR;
}
+ @Override
+ public void startHurryUp() {
+ singleThreadExecutor.execute( () -> {
+ hurryup();
+ });
+ }
+
+ @Override
+ public void startBedReload() {
+ singleThreadExecutor.execute( () -> {
+ bedReload();
+ hurryup();
+ });
+ }
/**
* 宸插叧闂� 鎴栬�� 鍏抽棴涓紝鍙互寮�閫氬伐浣�
@@ -245,7 +253,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;
@@ -264,7 +272,8 @@
bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
priorityQueue.offer(bedQueueBO);
mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);
- return SUCCESS;
+
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
@@ -300,20 +309,20 @@
mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
priorityQueue.remove(bedQueueBO);
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
public CommonResult<RoomRespVO> getRoom(Long roomId, String bedNo, Long docId) {
+ RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
+ if (null == roomDO) {
+ return error(ROOM_NOT_SIT);
+ }
+
BedQueueBO bedQueueBO = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
if (null == bedQueueBO) {
log.error("getRoom mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
return error(QUEUE_BED_NOT_EXIST);
- }
-
- RoomDO roomDO = roomMapper.getRoom(roomId, bedNo, docId);
- if (null == roomDO) {
- return error(ROOM_NOT_SIT);
}
RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
@@ -339,7 +348,7 @@
bedQueueBO.setStatus(BedStatusEnum.PAUSE.getStatus());
priorityQueue.remove(bedQueueBO);
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
@@ -368,8 +377,7 @@
return ECG_INNER_ERROR;
}
- hurryup();
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
@@ -390,7 +398,7 @@
}
bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
@Override
@@ -404,14 +412,25 @@
// 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());
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
private void validatequeueExists(Integer id) {
@@ -473,7 +492,7 @@
Integer num = queueMapper.getMaxSeqNum();
curSeqNum = new AtomicInteger(null == num ? 0 : num);
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
/**
@@ -483,12 +502,6 @@
public void hurryup() {
if (0 == openingFlag.get())
return;
-
- // TODO
- log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size());
- if (mapBedVsQueue.size() != priorityQueue.size()) {
- log.error("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size());
- }
// 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉
for (BedQueueBO bedQueueBO : mapBedVsQueue.values()) {
@@ -582,8 +595,7 @@
priorityQueue.remove(bo);
priorityQueue.offer(bo);
- hurryup();
- return SUCCESS;
+ return GlobalErrorCodeConstants.SUCCESS;
}
public void finishNextPatient(Long roomId, String bedNo) {
@@ -646,40 +658,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());
@@ -694,17 +672,10 @@
return updateNum;
}
- private void startHurryUp() {
- singleThreadExecutor.execute( () -> {
- hurryup();
- });
- }
-
- private void startBedReload() {
- singleThreadExecutor.execute( () -> {
- bedReload();
- hurryup();
- });
+ @Override
+ public void monitorInfo() {
+ log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size()
+ + " opening " + openingFlag.get());
}
}
--
Gitblit v1.9.3