From cce9d33e6c03ab48fb22c62fe5de3d1e902c598f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 14:25:51 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 c145fe5..f9edf00 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,8 @@
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 cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -137,7 +139,7 @@
ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
if (result.equals(SUCCESS))
- return success(0);
+ return success(SUCCESS.getCode());
return error(result);
}
@@ -154,7 +156,7 @@
ErrorCode result = queueService.startBedDoctorResume(roomId, bedNo, userId, userNickname);
if (result.equals(SUCCESS))
- return success(0);
+ return success(SUCCESS.getCode());
return error(result);
}
@@ -193,6 +195,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