From 9ddc38c82866653987733935c380496a79d70945 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 13 九月 2024 15:26:03 +0800
Subject: [PATCH] 设备遗失功能完成
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 108 ++++++++---------------------------------------------
1 files changed, 17 insertions(+), 91 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 df66cb0..5997673 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,8 +1,10 @@
package cn.lihu.jh.module.ecg.controller.admin.queue;
+import cn.hutool.extra.servlet.ServletUtil;
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.controller.admin.callingscreen.CallingRespVO;
+import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,6 +33,8 @@
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
+import javax.annotation.security.PermitAll;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import javax.annotation.Resource;
@@ -43,6 +47,9 @@
@Resource
private QueueService queueService;
+
+ @Resource
+ private EcgConfigService ecgConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鎺掗槦")
@@ -126,95 +133,6 @@
return error(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)
- {
- Long userId = SecurityFrameworkUtils.getLoginUserId();
- String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
-
- ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
- if (result.equals(SUCCESS))
- 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);
- }
-
- @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();
-
- ErrorCode result = queueService.startBedDoctorOn(roomId, bedNo, userId, userNickname);
- if (result.equals(SUCCESS))
- return success(0);
-
- return error(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();
-
- ErrorCode result = queueService.startBedDoctorOff(roomId, bedNo, userId, userNickname);
- if (result.equals(SUCCESS))
- return success(0);
-
- 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')")
- public CommonResult<Integer> startBiz() {
- queueService.startBiz();
- return success(0);
- }
-
@GetMapping("/patient-jump")
@Operation(summary = "鎻掗槦")
@Parameter(name = "patId", description = "鎮ｈ�呯紪鍙�", required = true, example = "B2")
@@ -230,4 +148,12 @@
return success("success");
}
+ @GetMapping("/reset-scheduler")
+ @Operation(summary = "閲嶇疆璋冨害鍣�")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
+ public CommonResult<Integer> resetScheduler() {
+ ecgConfigService.resetScheduler();
+ return success(0);
+ }
+
}
--
Gitblit v1.9.3