From 6c5098a2ab950684accd6fa74820a95a079a45b5 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 05 九月 2024 09:33:00 +0800
Subject: [PATCH] 调整 Calling Data Type
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 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 4c774eb..4ae696f 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,13 @@
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;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
@@ -32,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;
@@ -44,6 +51,9 @@
@Resource
private QueueService queueService;
+
+ @Resource
+ private EcgConfigService ecgConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鎺掗槦")
@@ -127,14 +137,6 @@
return error(result);
}
- @GetMapping("/startbiz")
- @Operation(summary = "鎵嬪姩寮�璇�")
- @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
- public CommonResult<Integer> startBiz() {
- queueService.startBiz();
- return success(0);
- }
-
@GetMapping("/patient-jump")
@Operation(summary = "鎻掗槦")
@Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
@@ -154,7 +156,35 @@
@Operation(summary = "閲嶇疆璋冨害鍣�")
@PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
public CommonResult<Integer> resetScheduler() {
- queueService.resetScheduler();
+ ecgConfigService.resetScheduler();
return success(0);
}
+
+ @GetMapping("/calling-data")
+ @Operation(summary = "澶у睆鍙彿鏁版嵁")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
+ public CommonResult<List<CallingRespVO>> callingData(
+ @RequestParam("waitingNum") Integer waitingNum,
+ @RequestParam("passedNum") Integer passedNum)
+ {
+ List<QueueDO> queueDOList = queueService.callingData(waitingNum, passedNum);
+ return success( BeanUtils.toBean(queueDOList, CallingRespVO.class) );
+ }
+
+ @GetMapping("/room-screen-data")
+ @Operation(summary = "璇婇棿灞忔暟鎹�")
+ @PermitAll
+ public CommonResult<List<CallingRespVO>> 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, CallingRespVO.class));
+ }
+
}
--
Gitblit v1.9.3