From 896e6debf24f26039ae0cfac51a0a6ba62a8b777 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 30 八月 2024 11:16:15 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 77 ++++++++------------------------------
1 files changed, 17 insertions(+), 60 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..4c774eb 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 org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,6 +19,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;
@@ -37,7 +40,7 @@
@RestController
@RequestMapping("/ecg/queue")
@Validated
-public class queueController {
+public class QueueController {
@Resource
private QueueService queueService;
@@ -103,11 +106,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,64 +120,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, "鍑洪敊浜�"));
- }
-
- @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("docId") Long docId,
- @RequestParam("docName") String docName)
- {
- 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, "鍑洪敊浜�"));
+ return error(result);
}
@GetMapping("/startbiz")
@@ -200,4 +150,11 @@
return success("success");
}
+ @GetMapping("/reset-scheduler")
+ @Operation(summary = "閲嶇疆璋冨害鍣�")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
+ public CommonResult<Integer> resetScheduler() {
+ queueService.resetScheduler();
+ return success(0);
+ }
}
--
Gitblit v1.9.3