From b765c3a93685c4c97601aff6291a00ec770a537e Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 04 九月 2024 18:19:35 +0800
Subject: [PATCH] 诊间屏

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
index 381f824..05ab0b3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java
@@ -1,8 +1,11 @@
 package cn.lihu.jh.module.ecg.controller.admin.queue;
 
+import cn.hutool.extra.servlet.ServletUtil;
 import cn.lihu.jh.framework.common.exception.ErrorCode;
+import cn.lihu.jh.framework.common.util.servlet.ServletUtils;
 import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
 import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
 import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
 import cn.lihu.jh.module.ecg.service.config.EcgConfigServiceImpl;
 import org.springframework.scheduling.config.ScheduledTaskRegistrar;
@@ -34,6 +37,8 @@
 import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
 import cn.lihu.jh.module.ecg.service.queue.QueueService;
 
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import javax.annotation.Resource;
@@ -154,4 +159,32 @@
         ecgConfigService.resetScheduler();
         return success(0);
     }
+
+    @GetMapping("/calling-data")
+    @Operation(summary = "澶у睆鍙彿鏁版嵁")
+    @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
+    public CommonResult<List<QueueRespVO>> callingData(
+            @RequestParam("waitingNum") Integer waitingNum,
+            @RequestParam("passedNum") Integer passedNum)
+    {
+        List<QueueDO> queueDOList = queueService.callingData(waitingNum, passedNum);
+        return success( BeanUtils.toBean(queueDOList, QueueRespVO.class) );
+    }
+
+    @GetMapping("/room-screen-data")
+    @Operation(summary = "璇婇棿灞忔暟鎹�")
+    @PermitAll
+    public CommonResult<List<QueueRespVO>> callingDataRoom(HttpServletRequest request)
+    {
+        String reqIp = ServletUtil.getClientIP(request);
+
+        List<Byte> queueStatusList = new ArrayList<>();
+        queueStatusList.add(QueueStatusEnum.READY.getStatus());
+        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
+        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+
+        List<QueueDO> queueDOList = queueService.getRoomQueue(reqIp, queueStatusList);
+        return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+    }
+
 }

--
Gitblit v1.9.3