From 1dfb9beb8057d51d528a209fae1a9f9eed5c352f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 24 九月 2024 17:47:13 +0800
Subject: [PATCH] 新增 设备状态

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/BedOpenCallable.java |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 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 2096007..1fa9ac0 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,36 +1,34 @@
 package cn.lihu.jh.module.ecg.service.queue;
 
-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.ErrorCode;
+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<Integer> {
+public class BedOpenCallable implements Callable<ErrorCode> {
 
     QueueService queueService;
     private Long roomId;
+    private String roomName;
     private String bedNo;
 
-    public BedOpenCallable(QueueService queueService, Long roomId, String bedNo)
+    public BedOpenCallable(QueueService queueService, Long roomId, String roomName, String bedNo)
     {
         super();
         this.roomId = roomId;
+        this.roomName = roomName;
         this.bedNo = bedNo;
         this.queueService = queueService;
     }
 
-    public Integer call() throws Exception {
-        return queueService.bedOpen(roomId, bedNo);
+    public ErrorCode call() throws Exception {
+        ErrorCode ec = queueService.bedOpen(roomId, roomName, bedNo);
+        if (GlobalErrorCodeConstants.SUCCESS.equals(ec)) {
+            queueService.hurryup();
+        }
+
+        queueService.monitorInfo();
+        return ec;
     }
 
 }

--
Gitblit v1.9.3