From 9b18e467d407c66ecc3c46a197aca45dcc3f8056 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期二, 27 八月 2024 09:11:02 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 82 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 76 insertions(+), 6 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 3174a56..f9eab4e 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,6 +1,7 @@ package cn.lihu.jh.module.ecg.controller.admin.queue; import cn.lihu.jh.framework.common.exception.ErrorCode; +import cn.lihu.jh.framework.security.core.util.SecurityFrameworkUtils; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -95,16 +96,85 @@ BeanUtils.toBean(list, QueueRespVO.class)); } - @GetMapping("/bed-control") - @Operation(summary = "宸ヤ綅鎺у埗") + @GetMapping("/bed-open") + @Operation(summary = "宸ヤ綅寮�閫�") @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')") - public CommonResult<Integer> bedControl( + public CommonResult<Integer> bedOpen( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo) + { + Integer result = queueService.startBedOpen(roomId, bedNo); + if (null == result || 0 == result) + return success(0); + + return error(new ErrorCode(result, "鍑洪敊浜�")); + } + + @GetMapping("/bed-close") + @Operation(summary = "宸ヤ綅鍏抽棴") + @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')") + public CommonResult<Integer> bedClose( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo) + { + Integer result = queueService.startBedClose(roomId, bedNo); + if (null == result || 0 == result) + return success(0); + + return error(new ErrorCode(result, "鍑洪敊浜�")); + } + + @GetMapping("/bed-doctor-pause") + @Operation(summary = "鍖荤敓鏆傚仠") + @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')") + public CommonResult<Integer> bedPause( @RequestParam("roomId") Long roomId, @RequestParam("bedNo") String bedNo, - @RequestParam("status") Integer status) + @RequestParam("docId") Long docId, + @RequestParam("docName") String docName) { - queueService.bedControl(roomId, bedNo, status); - return success(0); + Long userId = SecurityFrameworkUtils.getLoginUserId(); + String userNickname = SecurityFrameworkUtils.getLoginUserNickname(); + + Integer result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname); + if (null == result || 0 == result) + return success(0); + + return error(new ErrorCode(result, "鍑洪敊浜�")); + } + + @GetMapping("/bed-doctor-on") + @Operation(summary = "鍖荤敓鍏ュ骇") + @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')") + public CommonResult<Integer> bedDoctorOn( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo) + { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + String userNickname = SecurityFrameworkUtils.getLoginUserNickname(); + + Integer result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname); + if (null == result || 0 == result) + return success(0); + + return error(new ErrorCode(result, "鍑洪敊浜�")); + } + + @GetMapping("/bed-doctor-off") + @Operation(summary = "鍖荤敓绂诲骇") + @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')") + public CommonResult<Integer> bedDoctorOff( + @RequestParam("roomId") Long roomId, + @RequestParam("bedNo") String bedNo) + { + Long userId = SecurityFrameworkUtils.getLoginUserId(); + String userNickname = SecurityFrameworkUtils.getLoginUserNickname(); + + Integer result = queueService.startBedDoctorOff(roomId, bedNo, userId, userNickname); + if (null == result || 0 == result) + return success(0); + + return error(new ErrorCode(result, "鍑洪敊浜�")); } @GetMapping("/startbiz") -- Gitblit v1.9.3