From 4abbab0da3fe61b237795e5e9a8d10ba5db4c706 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 11:37:43 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 52 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 18 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 f9eab4e..c145fe5 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
@@ -17,6 +17,7 @@
import cn.lihu.jh.framework.common.pojo.CommonResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
+import static cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants.SUCCESS;
import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
@@ -103,11 +104,11 @@
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
- Integer result = queueService.startBedOpen(roomId, bedNo);
- if (null == result || 0 == result)
+ ErrorCode result = queueService.startBedOpen(roomId, bedNo);
+ if (result.equals(SUCCESS))
return success(0);
- return error(new ErrorCode(result, "鍑洪敊浜�"));
+ return error(result);
}
@GetMapping("/bed-close")
@@ -117,11 +118,11 @@
@RequestParam("roomId") Long roomId,
@RequestParam("bedNo") String bedNo)
{
- Integer result = queueService.startBedClose(roomId, bedNo);
- if (null == result || 0 == result)
+ ErrorCode result = queueService.startBedClose(roomId, bedNo);
+ if (result.equals(SUCCESS))
return success(0);
- return error(new ErrorCode(result, "鍑洪敊浜�"));
+ return error(result);
}
@GetMapping("/bed-doctor-pause")
@@ -129,18 +130,33 @@
@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();
- Integer result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
- if (null == result || 0 == result)
+ ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
return success(0);
- return error(new ErrorCode(result, "鍑洪敊浜�"));
+ 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(0);
+
+ return error(result);
}
@GetMapping("/bed-doctor-on")
@@ -153,11 +169,11 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- Integer result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname);
- if (null == result || 0 == result)
+ ErrorCode result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
return success(0);
- return error(new ErrorCode(result, "鍑洪敊浜�"));
+ return error(result);
}
@GetMapping("/bed-doctor-off")
@@ -170,11 +186,11 @@
Long userId = SecurityFrameworkUtils.getLoginUserId();
String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
- Integer result = queueService.startBedDoctorOff(roomId, bedNo, userId, userNickname);
- if (null == result || 0 == result)
+ ErrorCode result = queueService.startBedDoctorOff(roomId, bedNo, userId, userNickname);
+ if (result.equals(SUCCESS))
return success(0);
- return error(new ErrorCode(result, "鍑洪敊浜�"));
+ return error(result);
}
@GetMapping("/startbiz")
--
Gitblit v1.9.3