From 4b278300e8b3b1faabd5d080990cd3124f68612c Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 26 十一月 2024 13:09:28 +0800
Subject: [PATCH] 会取下一个时段的序号

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java |   27 ++++++++++++---------------
 1 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
index ce858c6..d299f27 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java
@@ -1,37 +1,34 @@
 package cn.lihu.jh.module.ecg.service.queue;
 
 import cn.lihu.jh.framework.common.exception.ErrorCode;
-import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
-import cn.lihu.jh.module.ecg.dal.mysql.queue.queueMapper;
-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.framework.common.exception.enums.GlobalErrorCodeConstants;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static cn.lihu.jh.module.ecg.service.queue.QueueService.MAX_QUEUE_NUM;
 
 public class BedOpenCallable implements Callable<ErrorCode> {
 
-    QueueService queueService;
+    QueueServiceTxFunctions queueService;
     private Long roomId;
+    private String roomName;
     private String bedNo;
 
-    public BedOpenCallable(QueueService queueService, Long roomId, String bedNo)
+    public BedOpenCallable(QueueServiceTxFunctions queueService, Long roomId, String roomName, String bedNo)
     {
         super();
         this.roomId = roomId;
+        this.roomName = roomName;
         this.bedNo = bedNo;
         this.queueService = queueService;
     }
 
     public ErrorCode call() throws Exception {
-        return queueService.bedOpen(roomId, bedNo);
+        ErrorCode ec = queueService.bedOpen(roomId, roomName, bedNo);
+        if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
+            queueService.hurryupOneBed(roomId, bedNo);
+        }
+
+        queueService.monitorInfo();
+        return ec;
     }
 
 }

--
Gitblit v1.9.3