每天不需要关闭工位，仅提出医生

eight

2024-10-08 b54d1d876fc2b8e927be31221a185c64814338e4

每天不需要关闭工位，仅提出医生

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java

@@ -175,7 +175,7 @@
    @GetMapping(value = {"/reset-room"})
    @Operation(summary = "重置门诊室", description = "主要用于每天关闭工位")
    public CommonResult<String> resetRoom() {
        roomService.resetRoom();
        roomService.resetRoom(true);
        return success("reset room ok");
    }


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/config/EcgConfigServiceImpl.java

@@ -71,7 +71,7 @@

        resetRoomTask = taskRegistrar.scheduleCronTask(new CronTask(() -> {
            System.out.println("Room Reset Task executed at: " + System.currentTimeMillis());
            roomService.resetRoom();
            roomService.resetRoom(false);
        }, roomResetCronExpression));

        taskRegistrar.afterPropertiesSet();

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueService.java

@@ -51,7 +51,7 @@
     */
    void startHurryUp();
    void startBedReload();
    void startResetRoom();
    void startResetRoom(Boolean needCloseBed);
    MonitorInfoVO getMonitorInfo();

    ErrorCode startBedOpen(Long roomId, String roomName, String bedNo);

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceImpl.java

@@ -239,9 +239,9 @@
    }

    @Override
    public void startResetRoom() {
    public void startResetRoom(Boolean needCloseBed) {
        singleThreadExecutor.execute( () -> {
            queueServiceTxFunctions.resetRoom();
            queueServiceTxFunctions.resetRoom(needCloseBed);
            queueServiceTxFunctions.bedReload();
            queueServiceTxFunctions.monitorInfo();
        });

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/queue/QueueServiceTxFunctions.java

@@ -313,7 +313,7 @@
        return GlobalErrorCodeConstants.SUCCESS;
    }

    public void resetRoom() {
    public void resetRoom(Boolean needCloseBed) {
        // 踢出在座的医生
        List<BedStatusEnum> bedStatusEnumList = new ArrayList<BedStatusEnum>();
        bedStatusEnumList.add(BedStatusEnum.DOCTOR_ON);
@@ -323,7 +323,9 @@
        oAuth2TokenApi.tick(userIdList);

        // 关闭所有工位
        Integer ret = roomMapper.resetRoom(BedStatusEnum.CLOSED.getStatus());
        if (needCloseBed) {
            Integer ret = roomMapper.resetRoom(BedStatusEnum.CLOSED.getStatus());
        }
    }

    /**

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomService.java

@@ -61,7 +61,7 @@

    List<RoomDO> simpleRoomList();

    void resetRoom();
    void resetRoom(Boolean needCloseBed);

    MonitorInfoVO getMonitorInfo();


 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/room/RoomServiceImpl.java

@@ -109,8 +109,8 @@
    }

    @Override
    public void resetRoom() {
        queueService.startResetRoom();
    public void resetRoom(Boolean needCloseBed) {
        queueService.startResetRoom(needCloseBed);
    }

    @Override