update

eight

2024-09-18 736f3444c1433a885bc4242b45bb8ab463075386

 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/queue/queueController.java

@@ -1,12 +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 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 cn.lihu.jh.module.ecg.service.config.EcgConfigServiceImpl;
import org.springframework.scheduling.config.ScheduledTaskRegistrar;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -35,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;
@@ -110,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);

@@ -154,33 +155,6 @@
    public CommonResult<Integer> resetScheduler() {
        ecgConfigService.resetScheduler();
        return success(0);
    }

    @GetMapping("/calling-data")
    @Operation(summary = "大屏叫号数据")
    @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
    public CommonResult<List<QueueRespVO>> callingData(
            @RequestParam("waitingNum") Integer waitingNum,
            @RequestParam("passedNum") Integer passedNum)
    {
        List<QueueDO> queueDOList = queueService.callingData(waitingNum, passedNum);
        return success( BeanUtils.toBean(queueDOList, QueueRespVO.class) );
    }

    @GetMapping("/room-screen-data")
    @Operation(summary = "诊间屏数据")
    @PreAuthorize("@ss.hasPermission('ecg:queue:setting')")
    public CommonResult<List<QueueRespVO>> callingDataRoom(
            @RequestParam("roomId") Long roomId,
            @RequestParam("bedNo") String bedNo)
    {
        List<Byte> queueStatusList = new ArrayList<>();
        queueStatusList.add(QueueStatusEnum.READY.getStatus());
        queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());

        List<QueueDO> queueDOList = queueService.getDoctorQueueByStatus(roomId, bedNo, queueStatusList);
        return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
    }

}