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 | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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..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
@@ -37,6 +37,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;
@@ -162,18 +163,18 @@
@GetMapping("/calling-data")
@Operation(summary = "澶у睆鍙彿鏁版嵁")
@PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
- public CommonResult<List<QueueRespVO>> callingData(
+ 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, QueueRespVO.class) );
+ return success( BeanUtils.toBean(queueDOList, CallingRespVO.class) );
}
@GetMapping("/room-screen-data")
@Operation(summary = "璇婇棿灞忔暟鎹�")
- @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
- public CommonResult<List<QueueRespVO>> callingDataRoom(HttpServletRequest request)
+ @PermitAll
+ public CommonResult<List<CallingRespVO>> callingDataRoom(HttpServletRequest request)
{
String reqIp = ServletUtil.getClientIP(request);
@@ -183,7 +184,7 @@
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
List<QueueDO> queueDOList = queueService.getRoomQueue(reqIp, queueStatusList);
- return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
+ return success(BeanUtils.toBean(queueDOList, CallingRespVO.class));
}
}
--
Gitblit v1.9.3