From 54362e29d0a5aa2f33f5e7ed1f37c5d7beba428c Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 18 九月 2024 14:36:28 +0800 Subject: [PATCH] typo --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java | 34 ++++++++++------------------------ 1 files changed, 10 insertions(+), 24 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 0a4345d..8efdddd 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 @@ -57,6 +57,11 @@ Integer queueReadyMax = 0; + Integer bigScrenWaitingSize = 5; + Integer bigScrenPassedSize = 5; + Integer bigScrenWaitingFrom = 0; + Integer bigScrenPassedFrom = 0; + @Override public Integer createqueue(QueueSaveReqVO createReqVO) { // 鎻掑叆 @@ -84,8 +89,8 @@ } @Override - public ErrorCode startBedOpen(Long roomId, String bedNo) { - Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, bedNo)); + public ErrorCode startBedOpen(Long roomId, String roomName, String bedNo) { + Future<ErrorCode> future = singleThreadExecutor.submit( new BedOpenCallable(this, roomId, roomName, bedNo)); try { ErrorCode ret = future.get(); @@ -244,7 +249,7 @@ * @return */ @Override - public ErrorCode bedOpen(Long roomId, String bedNo) { + public ErrorCode bedOpen(Long roomId, String roomName, String bedNo) { BedQueueBO bedQueueBO2 = mapBedVsQueue.get(String.format("%09d%s", roomId, bedNo)); if (null != bedQueueBO2) { log.error("bedOpen mapBedVsQueue has existed. " + roomId + " " + bedNo); @@ -267,6 +272,7 @@ // 鏂板宸ヤ綅 浼樺厛闃熷垪 BedQueueBO bedQueueBO = new BedQueueBO(); bedQueueBO.setRoomId(roomId); + bedQueueBO.setRoomName(roomName); bedQueueBO.setBedNo(bedNo); bedQueueBO.setMaxQueueNum(queueReadyMax); bedQueueBO.setQueueNum(new AtomicInteger(queueDOList.size())); @@ -497,8 +503,7 @@ } /** - * TODO 鏂板紑闃熷垪鏃讹紝闇�瑕佹妸鎺掗槦涓殑浜� 杞埌 灏辫瘖鍑嗗 鐘舵�� - * 绛夊埌鍙栦笅涓�涓� 鎺掗槦涓汉鍛� 鐨勯�昏緫瀹屾垚鍚庯紝鍐嶅洖鏉ヤ笉閿� + * */ public void hurryup() { if (0 == openingFlag.get()) @@ -678,25 +683,6 @@ public void monitorInfo() { log.info("map " + mapBedVsQueue.size() + " priority " + priorityQueue.size() + " opening " + openingFlag.get()); - } - - @Override - public List<QueueDO> callingData(Integer waitingNum, Integer passedNum) { - //queueMapper. - return null; - } - - @Override - public List<QueueDO> getRoomQueue(String ip, List<Byte> statusList) { - List<RoomDO> roomDOList = roomMapper.queueByIp(ip); - Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst(); - if (!optionalQueueDO.isPresent()) { - return new ArrayList<QueueDO>(); - } - - Long roomId = optionalQueueDO.get().getRoomId(); - List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList); - return queueDOList; } } -- Gitblit v1.9.3