From 7e62c03740217ab71ed26abaeb5a4241c3e01359 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 九月 2024 10:26:55 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 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 c3ed451..68d7ce2 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
@@ -2,13 +2,9 @@
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.controller.admin.callingscreen.CallingRespVO;
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;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +33,7 @@
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;
@@ -113,9 +110,10 @@
@PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
public CommonResult<Integer> bedOpen(
@RequestParam("roomId") Long roomId,
+ @RequestParam("roomName") String roomName,
@RequestParam("bedNo") String bedNo)
{
- ErrorCode result = queueService.startBedOpen(roomId, bedNo);
+ ErrorCode result = queueService.startBedOpen(roomId, roomName, bedNo);
if (result.equals(SUCCESS))
return success(0);
@@ -157,33 +155,6 @@
public CommonResult<Integer> resetScheduler() {
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 = "璇婇棿灞忔暟鎹�")
- @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
- 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