From 7e62c03740217ab71ed26abaeb5a4241c3e01359 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 18 九月 2024 10:26:55 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 84 ++++++++++--------------------------------
1 files changed, 20 insertions(+), 64 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 d1fad05..68d7ce2 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,7 +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.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;
@@ -30,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;
@@ -38,10 +43,13 @@
@RestController
@RequestMapping("/ecg/queue")
@Validated
-public class queueController {
+public class QueueController {
@Resource
private QueueService queueService;
+
+ @Resource
+ private EcgConfigService ecgConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鎺掗槦")
@@ -102,9 +110,10 @@
@PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
public CommonResult<Integer> bedOpen(
@RequestParam("roomId") Long roomId,
+ @RequestParam("roomName") String roomName,
@RequestParam("bedNo") String bedNo)
{
- ErrorCode result = queueService.startBedOpen(roomId, bedNo);
+ ErrorCode result = queueService.startBedOpen(roomId, roomName, bedNo);
if (result.equals(SUCCESS))
return success(0);
@@ -125,67 +134,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,
- @RequestParam("docId") Long docId,
- @RequestParam("docName") String docName)
- {
- Long userId = SecurityFrameworkUtils.getLoginUserId();
- String userNickname = SecurityFrameworkUtils.getLoginUserNickname();
-
- ErrorCode result = queueService.startBedDoctorPause(roomId, bedNo, userId, userNickname);
- if (result.equals(SUCCESS))
- return success(0);
-
- 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("/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")
@@ -201,4 +149,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