From 9ad12f4a3cbf1fc5bb2ef5a76a371064afac62fc Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 24 十月 2025 11:48:37 +0800
Subject: [PATCH] 新增日志
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
index 6e8abc4..965228c 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java
@@ -43,21 +43,16 @@
@GetMapping("/big-screen-data")
@Operation(summary = "澶у睆鍙彿鏁版嵁")
@PermitAll
- public CommonResult<Map<Integer, Map<Integer, List<ScreenQueueRespVO>>>> callingData()
+ public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingData()
{
- Map<Integer, Map<Integer, List<QueueDO>>> map = callingScreenService.getBigScreenPatient();
+ Map<Integer, List<QueueDO>> map = callingScreenService.getBigScreenPatient();
- Map<Integer, Map<Integer, List<ScreenQueueRespVO>>> mapVO = new HashMap<>();
+ Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
map.keySet().forEach( displayCol -> {
//log.info("dispayCol: " + displayCol);
- Map<Integer, List<QueueDO>> mapSoltQueueDO = map.get(displayCol);
- Map<Integer, List<ScreenQueueRespVO>> mapSoltQueueVO = new HashMap<>();
- mapSoltQueueDO.keySet().forEach( displaySlot -> {
- //log.info("displaySlot: " + displaySlot);
- mapSoltQueueVO.put(displaySlot, BeanUtils.toBean(mapSoltQueueDO.get(displaySlot), ScreenQueueRespVO.class));
- });
-
- mapVO.put(displayCol, mapSoltQueueVO);
+ List<QueueDO> columnQueueDOList = map.get(displayCol);
+ List<ScreenQueueRespVO> screenQueueRespVOList = BeanUtils.toBean(columnQueueDOList, ScreenQueueRespVO.class);
+ mapVO.put(displayCol, screenQueueRespVOList);
});
return success( mapVO );
@@ -66,12 +61,12 @@
@GetMapping("/room-screen-data")
@Operation(summary = "璇婇棿灞忔暟鎹�")
@PermitAll
- public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingDataRoom(HttpServletRequest request)
+ public CommonResult<Map<Integer, List<ScreenQueueRespVO>>> callingDataRoom(HttpServletRequest request, @RequestParam(value = "roomId", required = false)Long roomId)
{
String reqIp = ServletUtil.getClientIP(request);
- List<QueueDO> queueDOList1 = callingScreenService.getRoomCheckRelatedPatient(reqIp);
- List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp);
+ List<QueueDO> queueDOList1 = callingScreenService.getRoomCheckRelatedPatient(reqIp, roomId);
+ List<QueueDO> queueDOList2 = callingScreenService.getRoomInstallRelatedPatient(reqIp, roomId);
Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
mapVO.put(1, BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class));
--
Gitblit v1.9.3