From e8d835496ca0a82cbd291130ec3e4cc77baf738b Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 17 十月 2024 14:29:10 +0800
Subject: [PATCH] 大屏数据 update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
index 8f77ace..de872f3 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java
@@ -39,9 +39,9 @@
BigScreenConfig bigScreenConfig;
- Map<Integer, Integer> mapCheckTypeVsDisplayColumn = null;
+ Map<Integer, List<CheckTypeDO>> mapDisplayColName = null;
- Map<Integer, List<QueueDO>> mapDisplaySlotVsCallingData = new HashMap<>();
+ Map<Integer, Integer> mapCheckTypeVsDisplayColumn = null;
Integer waitingFrom = 0;
Integer passedFrom = 0;
@@ -51,13 +51,39 @@
this.bigScreenConfig = bigScreenConfig;
}
+
@Override
- public Map<Integer, List<QueueDO>> callingData() {
- if (null == mapCheckTypeVsDisplayColumn) {
- getDisplayColumnConfig();
- } else {
- mapDisplaySlotVsCallingData.values().stream().forEach(slotQueueList -> slotQueueList.clear());
+ public Map<Integer, List<String>> getDisplayColInfo() {
+ if (null == mapDisplayColName) {
+ CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
+ checkTypePageReqVO.setPageSize(-1);
+ PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
+ mapDisplayColName = pageResult.getList().stream().collect(Collectors.groupingBy(CheckTypeDO::getCallingColumn));
+ mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
}
+
+ Map<Integer, List<String>> _map = new HashMap<>();
+ mapDisplayColName.keySet().forEach(key -> {
+ _map.put(key, mapDisplayColName.get(key).stream().map(item->item.getName()).toList());
+ });
+ return _map;
+ }
+
+ @Override
+ public Map<Integer, Map<Integer, List<QueueDO>>> callingData() {
+ Map<Integer, Map<Integer, List<QueueDO>>> mapDisplayColQueue = new HashMap<>();
+ int displayColCnt = (int) mapCheckTypeVsDisplayColumn.values().stream().distinct().count();
+ for (int dispCol=0; dispCol<displayColCnt; dispCol++) {
+ Map<Integer, List<QueueDO>> mapSoltQueueData = new HashMap<>();
+ mapSoltQueueData.put(0, new ArrayList<>());
+ mapSoltQueueData.put(1, new ArrayList<>());
+ mapSoltQueueData.put(2, new ArrayList<>());
+ mapDisplayColQueue.put(dispCol, mapSoltQueueData);
+ }
+
+ mapDisplayColQueue.values().stream().forEach(mapSlotQueue -> {
+ mapSlotQueue.values().stream().forEach(queueList -> queueList.clear());
+ });
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -67,12 +93,14 @@
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
queueDOList.stream().forEach(queueDO -> {
- List<QueueDO> listSolt = getDisplatSlotByQueue( queueDO.getBookCheckType(), queueDO.getStatus());
- listSolt.add( queueDO );
+ Map<Integer, List<QueueDO>> mapSlotQueue = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
+ List<QueueDO> soltList = mapSlotQueue.get(getDisplatSlotByQueueStatus(queueDO.getStatus()));
+ soltList.add( queueDO );
});
- mapDisplaySlotVsCallingData.values().stream().forEach(slotQueueList -> slotQueueList.sort(null));
- return mapDisplaySlotVsCallingData;
+ mapDisplayColQueue.values().stream().forEach(mapSoltQueue -> mapSoltQueue.values().stream().forEach(
+ slotQueueList -> slotQueueList.sort((o1, o2) -> o1.getSeqNum() - o2.getSeqNum())));
+ return mapDisplayColQueue;
}
@Override
@@ -129,24 +157,6 @@
Long roomId = optionalQueueDO.get().getRoomId();
List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
return queueDOList;
- }
-
- private void getDisplayColumnConfig() {
- CheckTypePageReqVO checkTypePageReqVO = new CheckTypePageReqVO();
- checkTypePageReqVO.setPageSize(-1);
- PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPage(checkTypePageReqVO);
- mapCheckTypeVsDisplayColumn = pageResult.getList().stream().collect(Collectors.toMap(CheckTypeDO::getValue, item -> item.getCallingColumn()));
-
- int displayColCnt = (int) mapCheckTypeVsDisplayColumn.values().stream().distinct().count();
- for (int i=0; i<displayColCnt; i++) {
- mapDisplaySlotVsCallingData.put(i*1000 + 0, new ArrayList<>());
- mapDisplaySlotVsCallingData.put(i*1000 + 1, new ArrayList<>());
- mapDisplaySlotVsCallingData.put(i*1000 + 2, new ArrayList<>());
- }
- }
-
- private List<QueueDO> getDisplatSlotByQueue( Integer checkType, Integer queueStatus ) {
- return mapDisplaySlotVsCallingData.get(mapCheckTypeVsDisplayColumn.get(checkType)*1000 + getDisplatSlotByQueueStatus(queueStatus));
}
private Integer getDisplatSlotByQueueStatus( Integer queueStatus ) {
--
Gitblit v1.9.3