From db1ad1b67a55f005baea15a6d640df370a6c74a9 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 09 四月 2025 08:39:04 +0800 Subject: [PATCH] 工位分流控制信息 设置逻辑调整 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java | 202 +++++++++++++++++++++++-------------------------- 1 files changed, 95 insertions(+), 107 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java index 4c2f2be..6b7b460 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java @@ -69,10 +69,10 @@ AtomicInteger curSeqNum = new AtomicInteger(0); // 缁存姢 寮�鏀剧殑宸ヤ綅 - ConcurrentHashMap<String, RoutingBedBO> mapOpeningBed = new ConcurrentHashMap<>(); + ConcurrentHashMap<String, BedBO> mapOpeningBed = new ConcurrentHashMap<>(); // 瑁呮満宸ヤ綅..涓嶈繘鍏ュ垎娴侀槦鍒� - Map<Integer, PriorityBlockingQueue<RoutingBedBO>> mapCheckTypeRoutingQueue = new HashMap(); + Map<Integer, PriorityBlockingQueue<BedBO>> mapCheckTypeRoutingQueue = new HashMap(); Map<Integer, CheckTypeDO> mapCheckTypeVsReadyMax = null; @@ -83,8 +83,8 @@ * @return */ public ErrorCode bedOpen(Long roomId, String roomName, String bedNo) { - RoutingBedBO routingBedBO2 = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); - if (null != routingBedBO2) { + BedBO bedBO2 = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); + if (null != bedBO2) { log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo); return QUEUE_BED_EXIST; } @@ -98,30 +98,24 @@ return ROOM_INVALID_STATUS; } - List<Integer> queueStatusList = new ArrayList<>(); - queueStatusList.add(QueueStatusEnum.READY.getStatus()); - List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(roomId, bedNo, queueStatusList); - RoomDO roomDO = roomMapper.getRoom(roomId, bedNo); // 鏂板..宸ヤ綅闃熷垪 - RoutingBedBO routingBedBO = new RoutingBedBO(); - routingBedBO.setRoomId(roomId); - routingBedBO.setRoomName(roomName); - routingBedBO.setBedNo(bedNo); - routingBedBO.setMaxReadyPatNum(getBedReadyMax(roomId, bedNo)); - routingBedBO.setReadyPatNum(new AtomicInteger(queueDOList.size())); - routingBedBO.setStatus(BedStatusEnum.OPENING.getStatus()); - routingBedBO.setCheckTypes( roomDO.getCheckTypes() ); - routingBedBO.setOpType( roomDO.getOpType() ); - mapOpeningBed.put( Utils.formatRoomBed(roomId, bedNo), routingBedBO); + BedBO bedBO = new BedBO(); + bedBO.setRoomId(roomId); + bedBO.setRoomName(roomName); + bedBO.setBedNo(bedNo); + bedBO.setStatus(BedStatusEnum.OPENING.getStatus()); + bedBO.setCheckTypes( roomDO.getCheckTypes() ); + bedBO.setOpType( roomDO.getOpType() ); + mapOpeningBed.put( Utils.formatRoomBed(roomId, bedNo), bedBO); return GlobalErrorCodeConstants.SUCCESS; } public ErrorCode bedClose(Long roomId, String bedNo) { - RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); - if (null == routingBedBO) { + BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); + if (null == bedBO) { log.error("bedClose mapBedVsQueue DONOT existed. " + roomId + " " + bedNo); return QUEUE_BED_NOT_EXIST; } @@ -154,13 +148,13 @@ } mapOpeningBed.remove( Utils.formatRoomBed(roomId, bedNo) ); - removeRoutingQueue(routingBedBO); + removeRoutingQueue(bedBO); return GlobalErrorCodeConstants.SUCCESS; } public ErrorCode bedDoctorPause(Long roomId, String bedNo, Long docId, String docName) { - RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); - if (null == routingBedBO) { + BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); + if (null == bedBO) { log.error("bedDoctorPause mapBedVsQueue DONOT existed. " + roomId + " " + bedNo); return QUEUE_BED_NOT_EXIST; } @@ -174,14 +168,14 @@ return ROOM_INVALID_STATUS; } - routingBedBO.setStatus(BedStatusEnum.DOCTOR_PAUSE.getStatus()); - removeRoutingQueue(routingBedBO); + bedBO.setStatus(BedStatusEnum.DOCTOR_PAUSE.getStatus()); + removeRoutingQueue(bedBO); return GlobalErrorCodeConstants.SUCCESS; } public ErrorCode bedDoctorResume(Long roomId, String bedNo, Long docId, String docName) { - RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); - if (null == routingBedBO || !routingBedBO.getStatus().equals(BedStatusEnum.DOCTOR_PAUSE.getStatus())) { + BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); + if (null == bedBO || !bedBO.getStatus().equals(BedStatusEnum.DOCTOR_PAUSE.getStatus())) { log.error("bedDoctorResume mapBedVsQueue DONOT existed OR NOT Paused. " + roomId + " " + bedNo); return QUEUE_BED_NOT_EXIST; } @@ -196,14 +190,14 @@ return ROOM_INVALID_STATUS; } - routingBedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus()); - addRoutingQueue(routingBedBO); + bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus()); + addRoutingQueue(bedBO); return GlobalErrorCodeConstants.SUCCESS; } public ErrorCode bedDoctorOn(Long roomId, String bedNo, Long docId, String docName) { - RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); - if (null == routingBedBO) { + BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); + if (null == bedBO) { log.error("bedDoctorOn mapBedVsQueue DONOT existed. " + roomId + " " + bedNo); return QUEUE_BED_NOT_EXIST; } @@ -217,14 +211,14 @@ return ROOM_INVALID_STATUS; } - routingBedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus()); - addRoutingQueue(routingBedBO); + bedBO.setStatus(BedStatusEnum.DOCTOR_ON.getStatus()); + addRoutingQueue(bedBO); return GlobalErrorCodeConstants.SUCCESS; } public ErrorCode bedDoctorOff(Long roomId, String bedNo, Long docId, String docName) { - RoutingBedBO routingBedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) ); - if (null == routingBedBO) { + BedBO bedBO = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) ); + if (null == bedBO) { log.error("bedDoctorOff mapBedVsQueue DONOT existed. " + roomId + " " + bedNo); return QUEUE_BED_NOT_EXIST; } @@ -239,9 +233,9 @@ return ROOM_INVALID_STATUS; } - removeRoutingQueue(routingBedBO); + removeRoutingQueue(bedBO); - routingBedBO.setStatus(BedStatusEnum.OPENING.getStatus()); + bedBO.setStatus(BedStatusEnum.OPENING.getStatus()); return GlobalErrorCodeConstants.SUCCESS; } @@ -278,7 +272,7 @@ queueMapper.updateById( firstReadyQueueItem ); // 鍒嗘祦闃熷垪涓� 璇ュ伐浣� 鍊欒瘖涓腑浜虹殑鏁伴噺 鍑忎竴 - RoutingBedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) ); + BedBO bo = mapOpeningBed.get( Utils.formatRoomBed( roomId, bedNo ) ); bo.readyPatNum.getAndDecrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 hurry-up 涓敼鍙樹簡鍊� refreshRoutingQueue(bo); @@ -332,21 +326,9 @@ bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON); bedStatusEnumList.add(BedStatusEnum.DOCTOR_PAUSE); List<RoomDO> roomDOList = roomMapper.simpleRoomList(bedStatusEnumList); - List<RoutingBedBO> routingBedBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, RoutingBedBO.class)).toList(); + List<BedBO> bedBOList = roomDOList.stream().map(item -> BeanUtils.toBean(item, BedBO.class)).toList(); - // 浠嶥B 鑾峰彇 闃熷垪涓� 銆愬�欒瘖涓�戜汉鍛樼粺璁� 鍒楄〃 - List<Integer> queueStatusList = new ArrayList<>(); - queueStatusList.add(QueueStatusEnum.READY.getStatus()); - List<QueueStatisticDO> queueStatisticDOList = queueMapper.queueStatistic(queueStatusList); - - routingBedBOList.forEach(item -> { - item.setMaxReadyPatNum( getBedReadyMax(item.roomId, item.bedNo) ); - 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 ( item.getMaxReadyPatNum() < queueNum ) - throw new RuntimeException("init: exceed max queue number!"); - - item.setReadyPatNum( new AtomicInteger(queueNum) ); + bedBOList.forEach(item -> { mapOpeningBed.put( Utils.formatRoomBed(item.roomId, item.bedNo), item); if (BedStatusEnum.DOCTOR_ON.getStatus() == item.getStatus()) { addRoutingQueue(item); @@ -388,15 +370,15 @@ if (0 == openingFlag.get()) return; - RoutingBedBO routingBedBO = getBedQueueBO(roomId, bedNo); + BedBO bedBO = getBedQueueBO(roomId, bedNo); // 澶勭悊 杩囧彿-鍥炴潵 鐨勪汉 - while (routingBedBO.readyPatNum.get() < routingBedBO.maxReadyPatNum) { + while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) { // 鏌ョ湅 褰撳墠宸ヤ綅 鏄惁鏈夎繃鍙�-鍥炴潵鐨勬偅鑰� Integer updateNum = queueMapper.queueRecalledPatient( - routingBedBO.getRoomId(), - routingBedBO.getRoomName(), - routingBedBO.getBedNo(), + bedBO.getRoomId(), + bedBO.getRoomName(), + bedBO.getBedNo(), curSeqNum.get() + 1, // 杩囧彿鍥炴潵锛屾帓鍒板綋鍓嶇殑涓嬩竴浣� QueueStatusEnum.RECALLED.getStatus(), // 涓嶉渶瑕佸鐞� [瀹夎鍙洖], 鍘熷洜: 瀹夎宸ヤ綅 涓嶈繘鍏ュ垎娴侀槦鍒� QueueStatusEnum.READY.getStatus()); @@ -414,14 +396,14 @@ curSeqNum.getAndIncrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊� - routingBedBO.readyPatNum.incrementAndGet(); + bedBO.readyPatNum.incrementAndGet(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭 - refreshRoutingQueue(routingBedBO); + refreshRoutingQueue(bedBO); } // 澶勭悊 鎺掗槦涓� 鎮h�� - hurryupOneBedCheckTypeList(routingBedBO); + hurryupOneBedCheckTypeList(bedBO); } /** @@ -433,31 +415,31 @@ */ public void hurryupOneCheckType(Integer checkType) { - PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); + PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); if (null == routingQueue) return; while (true) { - RoutingBedBO routingBedBO = routingQueue.peek(); - if (null == routingBedBO) + BedBO bedBO = routingQueue.peek(); + if (null == bedBO) return; - int curQueueNum = routingBedBO.readyPatNum.get(); - if (curQueueNum > routingBedBO.maxReadyPatNum) + int curQueueNum = bedBO.readyPatNum.get(); + if (curQueueNum > bedBO.maxReadyPatNum) throw new RuntimeException("hurryupOneCheckType: exceed max queue number!"); - if (curQueueNum == routingBedBO.maxReadyPatNum) + if (curQueueNum == bedBO.maxReadyPatNum) return; // 鏌ョ湅 鏄惁鏈夋帓闃熶腑鐨勬偅鑰� Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes( - routingBedBO.getRoomId(), - routingBedBO.getRoomName(), - routingBedBO.getBedNo(), + bedBO.getRoomId(), + bedBO.getRoomName(), + bedBO.getBedNo(), curSeqNum.get() + 1, QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.READY.getStatus(), - routingBedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType + bedBO.checkTypes); //鍏抽敭鐐� 鍏抽敭鐐� 鍏抽敭鐐� checkType // 娌℃湁鎶㈠埌鎺掗槦鎮h�� if (null == updateNum || 0 == updateNum) { @@ -475,10 +457,10 @@ curSeqNum.getAndIncrement(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍊� - routingBedBO.readyPatNum.incrementAndGet(); + bedBO.readyPatNum.incrementAndGet(); // 鍙兘宸茬粡銆愬苟鍙戠殑銆戝湪 nextPatient 涓敼鍙樹簡鍒嗘祦闃熷垪椤哄簭 - refreshRoutingQueue(routingBedBO); + refreshRoutingQueue(bedBO); } } @@ -499,7 +481,7 @@ return mapCheckTypeVsReadyMax.get( checkType ); } - public RoutingBedBO getBedQueueBO(Long roomId, String bedNo) { + public BedBO getBedQueueBO(Long roomId, String bedNo) { return mapOpeningBed.get( Utils.formatRoomBed(roomId, bedNo) ); } @@ -517,17 +499,17 @@ log.info(" opening " + openingFlag.get() + " " + monitorInfoVO.getOpeningBedNum() + " " + monitorInfoVO.getDocBedNum() + " " + monitorInfoVO.getCheckTypeBedInfo().toString() ); } - private void hurryupOneBedCheckTypeList(RoutingBedBO routingBedBO) { - while (routingBedBO.readyPatNum.get() < routingBedBO.maxReadyPatNum) { + private void hurryupOneBedCheckTypeList(BedBO bedBO) { + while (bedBO.readyPatNum.get() < bedBO.maxReadyPatNum) { // 鎶㈠崰 鏄惁鏈夋帓闃熶腑鐨勬偅鑰� Integer updateNum = queueMapper.preemptWaitingPatientWithBedCheckTypes( - routingBedBO.getRoomId(), - routingBedBO.getRoomName(), - routingBedBO.getBedNo(), + bedBO.getRoomId(), + bedBO.getRoomName(), + bedBO.getBedNo(), curSeqNum.get() + 1, QueueStatusEnum.WAITING.getStatus(), QueueStatusEnum.READY.getStatus(), - routingBedBO.checkTypes); + bedBO.checkTypes); // 娌℃湁鎶㈠埌鎺掗槦鎮h�� if (null == updateNum || 0 == updateNum) { @@ -544,11 +526,11 @@ curSeqNum.getAndIncrement(); - routingBedBO.readyPatNum.incrementAndGet(); + bedBO.readyPatNum.incrementAndGet(); } // 鏀瑰彉浜嗗垎娴侀槦鍒楅『搴� - refreshRoutingQueue(routingBedBO); + refreshRoutingQueue(bedBO); } /** @@ -582,63 +564,69 @@ } } - private Integer getBedReadyMax(Long roomId, String bedNo) { - RoomDO roomDO = roomMapper.getRoom(roomId, bedNo); - Integer[] checkTypes = roomDO.getCheckTypes(); - Integer ret = 0; - for (int i=0; i<checkTypes.length; i++) { - CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkTypes[i]); + private Integer getBedReadyMax(BedBO bedBO) { + Integer[] checkTypes = bedBO.getCheckTypes(); + int ret = 0; + for (Integer checkType : checkTypes) { + CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkType); Integer tmp = checkTypeDO.getReadyNum(); ret = ret < tmp ? tmp : ret; //銆愬�欒瘖涓�戞暟閲� 鍙栧ぇ鍊� } return ret; } - private void addRoutingQueue(RoutingBedBO routingBedBO) { + private void addRoutingQueue(BedBO bedBO) { // 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴� - if (BedOpTypeEnum.OP_INSTALL.getOpType() == routingBedBO.getOpType()) + if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType())) return; - Integer[] checkTypes = routingBedBO.getCheckTypes(); + // 鍚屾DB, 璁剧疆宸ヤ綅鐨勫垎娴佹帶鍒朵俊鎭� + List<Integer> queueStatusList = new ArrayList<>(); + queueStatusList.add(QueueStatusEnum.READY.getStatus()); //[鍊欒瘖涓璢 + List<QueueDO> queueDOList = queueMapper.getBedQueueByStatus(bedBO.getRoomId(), bedBO.getBedNo(), queueStatusList); + bedBO.setMaxReadyPatNum( getBedReadyMax(bedBO) ); + bedBO.setReadyPatNum(new AtomicInteger(queueDOList.size())); + + Integer[] checkTypes = bedBO.getCheckTypes(); Arrays.stream(checkTypes).forEach(checkType -> { CheckTypeDO checkTypeDO = mapCheckTypeVsReadyMax.get(checkType); - PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); + PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); if (null == routingQueue) { - routingQueue = new PriorityBlockingQueue<RoutingBedBO>(); + routingQueue = new PriorityBlockingQueue<BedBO>(); mapCheckTypeRoutingQueue.put( checkType, routingQueue ); } - if (!routingQueue.contains(routingBedBO)) { - routingQueue.offer(routingBedBO); + if (!routingQueue.contains(bedBO)) { + routingQueue.offer(bedBO); } else { - log.error("bedDoctorResume routingQueue still exist!. " + routingBedBO.getRoomId() + " " + routingBedBO.getBedNo()); + log.error("bedDoctorResume routingQueue still exist!. " + bedBO.getRoomId() + " " + bedBO.getBedNo()); } }); } - private void removeRoutingQueue(RoutingBedBO routingBedBO) { + private void removeRoutingQueue(BedBO bedBO) { // 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴� - if (BedOpTypeEnum.OP_INSTALL.getOpType() == routingBedBO.getOpType()) + if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType())) return; - Integer[] checkTypes = routingBedBO.getCheckTypes(); + Integer[] checkTypes = bedBO.getCheckTypes(); Arrays.stream(checkTypes).forEach(checkType -> { - PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); + PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); if (null != routingQueue) - routingQueue.remove(routingBedBO); + routingQueue.remove(bedBO); }); } - private void refreshRoutingQueue(RoutingBedBO routingBedBO) { + private void refreshRoutingQueue(BedBO bedBO) { // 瑁呮満宸ヤ綅 涓嶈繘 鍒嗘祦闃熷垪锛屼笉鎺ユ敹 銆愭帓闃熶腑銆戞偅鑰呭垎娴� - if (BedOpTypeEnum.OP_INSTALL.getOpType() == routingBedBO.getOpType()) + if (Objects.equals(BedOpTypeEnum.OP_INSTALL.getOpType(), bedBO.getOpType())) return; - Integer[] checkTypes = routingBedBO.getCheckTypes(); + Integer[] checkTypes = bedBO.getCheckTypes(); Arrays.stream(checkTypes).forEach(checkType -> { - PriorityBlockingQueue<RoutingBedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); - routingQueue.remove(routingBedBO); - routingQueue.offer(routingBedBO); + PriorityBlockingQueue<BedBO> routingQueue = mapCheckTypeRoutingQueue.get(checkType); + routingQueue.remove(bedBO); + routingQueue.offer(bedBO); }); } @@ -689,7 +677,7 @@ }); // 鎺ユ敹..鎺掗槦涓偅鑰�..鐨勫垎娴侀槦鍒� - HashSet<RoutingBedBO> hashSetOperatingBedQueue = new HashSet<>(); + HashSet<BedBO> hashSetOperatingBedQueue = new HashSet<>(); mapCheckTypeRoutingQueue.values().forEach(routingQueue->{ routingQueue.stream().forEach(bedQueueBO -> hashSetOperatingBedQueue.add(bedQueueBO)); }); -- Gitblit v1.9.3