From 3be2584eca33b24abfa773a4c5ae6f5c1de31d76 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期一, 02 九月 2024 13:32:57 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 8 --------
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/DynamicSchedulingConfig.java | 9 ---------
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 20 ++++++++++++++++++++
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java | 1 +
4 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/DynamicSchedulingConfig.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/DynamicSchedulingConfig.java
index 9babe6a..cb26597 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/DynamicSchedulingConfig.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/DynamicSchedulingConfig.java
@@ -17,15 +17,6 @@
public static ScheduledTaskRegistrar static_scheduledTaskRegistrar;
- @Resource
- private ConfigApi configApi;
-
- @Resource
- private QueueService queueService;
-
- @Resource
- private RoomService roomService;
-
@Override
public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
DynamicSchedulingConfig.static_scheduledTaskRegistrar = taskRegistrar;
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 297aea6..381f824 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
@@ -132,14 +132,6 @@
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")
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
index 46386ce..d5e8195 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -8,6 +8,7 @@
import javax.validation.Valid;
import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import cn.lihu.jh.module.ecg.service.queue.QueueService;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -40,6 +41,9 @@
@Resource
private RoomService roomService;
+
+ @Resource
+ private QueueService queueService;
@Resource
private DeptApi deptApi;
@@ -167,4 +171,20 @@
return success( openingFlag );
}
+ @GetMapping("/start-biz")
+ @Operation(summary = "鎵嬪姩寮�璇�")
+ @PreAuthorize("@ss.hasPermission('ecg:room:setting')")
+ public CommonResult<Integer> startBiz() {
+ queueService.startBiz();
+ return success(0);
+ }
+
+ @GetMapping("/close-biz")
+ @Operation(summary = "鎵嬪姩闂瘖")
+ @PreAuthorize("@ss.hasPermission('ecg:room:setting')")
+ public CommonResult<Integer> stopBiz() {
+ queueService.closeBiz();
+ return success(0);
+ }
+
}
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
index 937ec3e..31ebc00 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java
@@ -650,6 +650,7 @@
public void closeBiz() {
openingFlag.set(0);
+ startBedReload();
}
@Override
--
Gitblit v1.9.3