eight
2024-09-02 3be2584eca33b24abfa773a4c5ae6f5c1de31d76
update
已修改4个文件
38 ■■■■■ 文件已修改
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/DynamicSchedulingConfig.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/queueServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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")
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);
    }
}
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