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 | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 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 4c774eb..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,9 +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 org.springframework.scheduling.config.ScheduledTaskRegistrar;
+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;
@@ -32,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;
@@ -44,6 +47,9 @@
@Resource
private QueueService queueService;
+
+ @Resource
+ private EcgConfigService ecgConfigService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓鎺掗槦")
@@ -104,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,14 +132,6 @@
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")
@@ -154,7 +153,8 @@
@Operation(summary = "閲嶇疆璋冨害鍣�")
@PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
public CommonResult<Integer> resetScheduler() {
- queueService.resetScheduler();
+ ecgConfigService.resetScheduler();
return success(0);
}
+
}
--
Gitblit v1.9.3