From e10ff52c2bbb86eac5b2c4bdf12b852912a1f798 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 14:44:12 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 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 d1fad05..df66cb0 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,6 +2,7 @@
import cn.lihu.jh.framework.common.exception.ErrorCode;
import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils;
+import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -38,7 +39,7 @@
@RestController
@RequestMapping("/ecg/queue")
@Validated
-public class queueController {
+public class QueueController {
@Resource
private QueueService queueService;
@@ -130,16 +131,31 @@
@PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
public CommonResult<Integer> bedPause(
@RequestParam("roomId") Long roomId,
- @RequestParam("bedNo") String bedNo,
- @RequestParam("docId") Long docId,
- @RequestParam("docName") String docName)
+ @RequestParam("bedNo") String bedNo)
{
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
if (result.equals(SUCCESS))
- return success(0);
+ return success(SUCCESS.getCode());
+
+ return error(result);
+ }
+
+ @GetMapping("/bed-doctor-resume")
+ @Operation(summary = "鍖荤敓鏆傚仠")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
+ public CommonResult<Integer> bedResume(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+ String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
+
+ ErrorCode result = queueService.startBedDoctorResume(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
+ return success(SUCCESS.getCode());
return error(result);
}
@@ -178,6 +194,19 @@
return error(result);
}
+ @GetMapping("/bed-doctor-get")
+ @Operation(summary = "鍖荤敓宸ヤ綅鑾峰彇")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
+ public CommonResult<RoomRespVO> bedDoctorGet(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ Long userId = SecurityFrameworkUtils.getLoginUserId();
+
+ CommonResult<RoomRespVO> result = queueService.getRoom(roomId, bedNo, userId);
+ return result;
+ }
+
@GetMapping("/startbiz")
@Operation(summary = "鎵嬪姩寮�璇�")
@PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
--
Gitblit v1.9.3