From aa2afbc3a63030ff81e6a7a3d0737d6c8d304c97 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期日, 01 九月 2024 12:29:36 +0800
Subject: [PATCH] 逻辑顺序调整
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 150 +++++++++++++++++++++++++++++++++----------------
1 files changed, 101 insertions(+), 49 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 5c80db5..518ed2e 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
@@ -10,6 +10,7 @@
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;
@@ -46,6 +47,7 @@
*/
@Service
@Validated
+@Slf4j
public class QueueServiceImpl implements QueueService {
@Resource
@@ -234,13 +236,20 @@
*/
@Override
public ErrorCode bedOpen(Long roomId, String bedNo) {
+ BedQueueBO bedQueueBO2 = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo));
+ if (null != bedQueueBO2) {
+ log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_EXIST;
+ }
+
// 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 )
+ Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo, BedStatusEnum.OPENING, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedOpen DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
+ }
List<Byte> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -252,7 +261,7 @@
bedQueueBO.setBedNo(bedNo);
bedQueueBO.setMaxQueueNum(queueReadyMax);
bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size()));
- bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
+ bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
priorityQueue.offer(bedQueueBO);
mapBedVsQueue.put(String.format("%09d%s", roomId, bedNo), bedQueueBO);
return SUCCESS;
@@ -261,10 +270,20 @@
@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 (null == bedQueueBO) {
+ log.error("bedClose mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
- if (bedQueueBO.getQueueNum().get() >0)
+ // 闄や簡鍒ゆ柇 鍑嗗鍊欒瘖涓� 鐨勪汉鏁帮紝杩橀渶瑕� 鍒ゆ柇 杩囧彿鐨勪汉鏁�
+ //if (bedQueueBO.getQueueNum().get() >0)
+ // return QUEUE_HAVE_PATIENT;
+ List<Byte> queueStatusList = new ArrayList<>();
+ queueStatusList.add(QueueStatusEnum.READY.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED_RETURN.getStatus());
+ List<QueueDO> queueDOList = queueMapper.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
+ if (queueDOList.size() > 0)
return QUEUE_HAVE_PATIENT;
// DB update
@@ -274,8 +293,10 @@
statusList.add(BedStatusEnum.PAUSE);
Integer updateNum = roomMapper.setBedOpeningClosed(roomId, bedNo,
BedStatusEnum.CLOSED, statusList);
- if ( null==updateNum || 0 == updateNum )
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedClose DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
+ }
mapBedVsQueue.remove(String.format("%09d%s", roomId, bedNo));
priorityQueue.remove(bedQueueBO);
@@ -284,15 +305,15 @@
@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) {
- System.out.println("getRoom ========");
- return error(ECG_INNER_ERROR);
+ 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);
}
RoomRespVO roomRespVO = BeanUtils.toBean(roomDO, RoomRespVO.class);
@@ -302,18 +323,21 @@
@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;
+ if (null == bedQueueBO) {
+ log.error("bedDoctorPause mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId,
- BedStatusEnum.PAUSE, statusList);
- if ( null==updateNum || 0 == updateNum )
+ Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId, BedStatusEnum.PAUSE, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorPause DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
+ }
- bedQueueBO.setStatusEnum(BedStatusEnum.PAUSE);
+ bedQueueBO.setStatus(BedStatusEnum.PAUSE.getStatus());
priorityQueue.remove(bedQueueBO);
return SUCCESS;
}
@@ -321,19 +345,28 @@
@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;
+ if (null == bedQueueBO || !bedQueueBO.getStatus().equals(BedStatusEnum.PAUSE.getStatus())) {
+ log.error("bedDoctorResume mapBedVsQueue DONOT existed OR NOT Paused. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.PAUSE);
Integer updateNum = roomMapper.setBedDoctorStatus(roomId, bedNo, docId,
BedStatusEnum.DOCTOR_ON, statusList);
- if ( null==updateNum || 0 == updateNum )
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorResume DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
+ }
- bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
- priorityQueue.offer(bedQueueBO);
+ bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
+ if (!priorityQueue.contains(bedQueueBO)) {
+ priorityQueue.offer(bedQueueBO);
+ } else {
+ log.error("bedDoctorResume priorityQueue still exist!. " + roomId + " " + bedNo);
+ return ECG_INNER_ERROR;
+ }
hurryup();
return SUCCESS;
@@ -342,38 +375,42 @@
@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;
+ if (null == bedQueueBO) {
+ log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// 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 )
+ Integer updateNum = roomMapper.setBedDoctorOn(roomId, bedNo, docId, docName, BedStatusEnum.DOCTOR_ON, statusList);
+ if ( null==updateNum || 0 == updateNum ) {
+ log.error("bedDoctorOn DB invalid status. " + roomId + " " + bedNo);
return ROOM_INVALID_STATUS;
+ }
- bedQueueBO.setStatusEnum(BedStatusEnum.DOCTOR_ON);
-
+ bedQueueBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus());
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;
+ if (null == bedQueueBO) {
+ log.error("bedDoctorOff mapBedVsQueue DONOT existed. " + roomId + " " + bedNo);
+ return QUEUE_BED_NOT_EXIST;
+ }
// DB update
List statusList = new ArrayList<BedStatusEnum>();
statusList.add(BedStatusEnum.DOCTOR_ON);
- Integer updateNum = roomMapper.setBedDoctorOff(roomId, bedNo, docId,
- BedStatusEnum.OPENING, statusList);
- if ( null==updateNum || 0 == updateNum )
+ 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;
+ }
- bedQueueBO.setStatusEnum(BedStatusEnum.OPENING);
-
+ bedQueueBO.setStatus(BedStatusEnum.OPENING.getStatus());
return SUCCESS;
}
@@ -398,9 +435,13 @@
* 1. 姣忓ぉ寮�璇婂墠 浠嶥B鍚屾宸ヤ綅鐨勬偅鑰呴槦鍒楁暟鎹埌 宸ヤ綅浼樺厛闃熷垪
* 2. 鏈嶅姟杩愮淮閲嶅惎鏃�
*/
- public void initBedQueueAndSeqNumFromDB() {
+ @Override
+ public ErrorCode bedReload() {
priorityQueue.clear();
mapBedVsQueue.clear();
+
+ // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
+ queueMapper.clearQueue();
// 浠嶥B 鑾峰彇 宸ヤ綅鍒楄〃
List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
@@ -423,12 +464,16 @@
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);
+ if (BedStatusEnum.PAUSE.getStatus() != item.getStatus()) {
+ priorityQueue.offer(item);
+ }
});
Integer num = queueMapper.getMaxSeqNum();
curSeqNum = new AtomicInteger(null == num ? 0 : num);
+
+ return SUCCESS;
}
/**
@@ -438,6 +483,12 @@
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()) {
@@ -520,7 +571,6 @@
// 浠� DB 鎶� 搴忓彿鏈�灏忕殑 灏辫瘖鍑嗗涓殑浜� 璁剧疆涓哄氨璇婁腑
Integer updateNum = queueMapper.updateQueueStatus(roomId, bedNo,
QueueStatusEnum.READY.getStatus(), QueueStatusEnum.ONSTAGE.getStatus());
-
// 璇ュ伐浣� 娌℃湁 灏辫瘖鍑嗗涓� 浜哄憳
if (null == updateNum || 0 == updateNum) {
return QUEUE_NOT_READY_PATIENT;
@@ -587,13 +637,8 @@
if (1 == openingFlag.get())
return;
- // 娓呴櫎闈炲綋澶╃殑鎺掗槦浜哄憳
- queueMapper.clearQueue();
-
- initBedQueueAndSeqNumFromDB();
-
openingFlag.set(1);
- hurryup();
+ startBedReload();
}
public void closeBiz() {
@@ -655,4 +700,11 @@
});
}
+ private void startBedReload() {
+ singleThreadExecutor.execute( () -> {
+ bedReload();
+ hurryup();
+ });
+ }
+
}
--
Gitblit v1.9.3