调整 Calling Data Type

eight

2024-09-05 6c5098a2ab950684accd6fa74820a95a079a45b5

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

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

    @GetMapping("/room-screen-data")
    @Operation(summary = "诊间屏数据")
    @PermitAll
    public CommonResult<List<QueueRespVO>> callingDataRoom(HttpServletRequest request)
    public CommonResult<List<CallingRespVO>> callingDataRoom(HttpServletRequest request)
    {
        String reqIp = ServletUtil.getClientIP(request);

@@ -184,7 +184,7 @@
        queueStatusList.add(QueueStatusEnum.PASSED.getStatus());

        List<QueueDO> queueDOList = queueService.getRoomQueue(reqIp, queueStatusList);
        return success(BeanUtils.toBean(queueDOList, QueueRespVO.class));
        return success(BeanUtils.toBean(queueDOList, CallingRespVO.class));
    }

}