From ebb3176d19e1800ec5fc8228d954ee78783bfcef Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期五, 06 九月 2024 11:37:52 +0800
Subject: [PATCH] update sql
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 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 3174a56..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,6 +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.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;
@@ -16,6 +20,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;
@@ -28,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;
@@ -36,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 = "鍒涘缓鎺掗槦")
@@ -95,24 +105,32 @@
BeanUtils.toBean(list, QueueRespVO.class));
}
- @GetMapping("/bed-control")
- @Operation(summary = "宸ヤ綅鎺у埗")
+ @GetMapping("/bed-open")
+ @Operation(summary = "宸ヤ綅寮�閫�")
@PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
- public CommonResult<Integer> bedControl(
+ public CommonResult<Integer> bedOpen(
@RequestParam("roomId") Long roomId,
- @RequestParam("bedNo") String bedNo,
- @RequestParam("status") Integer status)
+ @RequestParam("bedNo") String bedNo)
{
- queueService.bedControl(roomId, bedNo, status);
- return success(0);
+ ErrorCode result = queueService.startBedOpen(roomId, bedNo);
+ 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("/bed-close")
+ @Operation(summary = "宸ヤ綅鍏抽棴")
+ @PreAuthorize("@ss.hasPermission('ecg:queue:bedcontrol')")
+ public CommonResult<Integer> bedClose(
+ @RequestParam("roomId") Long roomId,
+ @RequestParam("bedNo") String bedNo)
+ {
+ ErrorCode result = queueService.startBedClose(roomId, bedNo);
+ if (result.equals(SUCCESS))
+ return success(0);
+
+ return error(result);
}
@GetMapping("/patient-jump")
@@ -130,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