From cb2507b0fddb4aeda36ea21addf77459d32d9996 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 12:10:01 +0800
Subject: [PATCH] 大屏 亲和项 处理
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 125 +++++++++--------------------------------
1 files changed, 29 insertions(+), 96 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 6a9acd0..b914470 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
@@ -76,20 +76,15 @@
* 涓嶄細鏈夊畨瑁呯浉鍏崇殑鎮ｈ�呬俊鎭�
*/
@Override
- public Map<Integer, Map<Integer, List<QueueDO>>> callingData() {
- Map<Integer, Map<Integer, List<QueueDO>>> mapDisplayColQueue = new HashMap<>();
+ public Map<Integer, List<QueueDO>> getBigScreenPatient() {
+ 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);
+ List<QueueDO> columnQueueData = new ArrayList<>();
+ mapDisplayColQueue.put(dispCol, columnQueueData);
}
- mapDisplayColQueue.values().stream().forEach(mapSlotQueue -> {
- mapSlotQueue.values().stream().forEach(queueList -> queueList.clear());
- });
+ mapDisplayColQueue.values().forEach(List::clear);
List<Integer> queueStatusList = new ArrayList<>();
queueStatusList.add(QueueStatusEnum.READY.getStatus());
@@ -97,83 +92,36 @@
queueStatusList.add(QueueStatusEnum.WAITING.getStatus());
queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
+ queueStatusList.add(QueueStatusEnum.PASSED_WAITING.getStatus());
queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
List<QueueDO> queueDOList = queueMapper.getQueueByStatus( queueStatusList );
- queueDOList.stream().forEach(queueDO -> {
- Map<Integer, List<QueueDO>> mapSlotQueue = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
- List<QueueDO> soltList = mapSlotQueue.get(getDisplatSlotByQueueStatus(queueDO.getStatus()));
- soltList.add( queueDO );
+ queueDOList.forEach(queueDO -> {
+ List<QueueDO> columnQueueData = mapDisplayColQueue.get(mapCheckTypeVsDisplayColumn.get(queueDO.getBookCheckType()));
+ columnQueueData.add( queueDO );
});
- mapDisplayColQueue.values().stream().forEach(mapSoltQueue -> mapSoltQueue.values().stream().forEach(
- slotQueueList -> slotQueueList.sort((o1, o2) -> {
- if (null == o1.getSeqNum() && null == o2.getSeqNum()) {
- return o1.getBookTimeslot() - o2.getBookTimeslot();
- } else if (null != o1.getSeqNum() && null != o2.getSeqNum()) {
- return o1.getSeqNum() - o2.getSeqNum();
- } else if (null == o1.getSeqNum()) {
- return 1;
- } else { //杩欓噷 蹇呭畾 null == o2.getSeqNum()
- return -1;
+ mapDisplayColQueue.values().forEach( _queueDOList -> {
+ //鎶� [浜插拰鐨刔 鎸埌涓婚」鍚庨潰
+ List<QueueDO> affinityWaitingList = new ArrayList<>();
+ ListIterator<QueueDO> iterator = _queueDOList.listIterator();
+ while (iterator.hasNext()) {
+ QueueDO item = iterator.next();
+ if (item.getStatus() == QueueStatusEnum.AFFINITY.getStatus()) {
+ iterator.remove();
+ affinityWaitingList.add(item);
+ }
+ }
+ affinityWaitingList.forEach( affinityWaitingItem -> {
+ for (int i = _queueDOList.size()-1; i >= 0; i--) {
+ if ( affinityWaitingItem.getSeqNum() == _queueDOList.get(i).getSeqNum() ) {
+ _queueDOList.add(i + 1, affinityWaitingItem);
+ break;
}
- })));
+ }
+ });
+ });
+
return mapDisplayColQueue;
- }
-
- @Override
- public Map<Integer, List<QueueDO>> callingData2() {
- List<Integer> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- List<QueueDO> listReady = queueMapper.getQueueByStatus( queueStatusList );
-
- queueStatusList.clear();
- queueStatusList.add(QueueStatusEnum.WAITING.getStatus());
- queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
- List<QueueDO> listWaiting = queueMapper.getPartialQueueByStatus( queueStatusList, waitingFrom, bigScreenConfig.waitingSize );
- if (listWaiting.size() < bigScreenConfig.waitingSize && waitingFrom != 0) {
- List<QueueDO> listWaiting_next = queueMapper.getPartialQueueByStatus( queueStatusList, 0, bigScreenConfig.waitingSize - listWaiting.size());
- listWaiting.addAll(listWaiting_next);
- }
- if (listWaiting.size() < bigScreenConfig.waitingSize) {
- waitingFrom = 0;
- } else {
- waitingFrom = listWaiting.getLast().getId() + 1;
- }
-
- queueStatusList.clear();
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- List<QueueDO> listPassed = queueMapper.getPartialQueueByStatus( queueStatusList, passedFrom, bigScreenConfig.passedSize );
- if (listPassed.size() < bigScreenConfig.passedSize && passedFrom != 0) {
- List<QueueDO> listPassed_next = queueMapper.getPartialQueueByStatus( queueStatusList, 0, bigScreenConfig.passedSize - listPassed.size());
- listPassed.addAll(listPassed_next);
- }
- if (listPassed.size() < bigScreenConfig.passedSize) {
- passedFrom = 0;
- } else {
- passedFrom = listPassed.getLast().getId();
- }
-
- log.info( " waitingFrom: {} passedFrom: {} ", waitingFrom, passedFrom);
-
- Map<Integer, List<QueueDO>> map = new HashMap<>();
- map.put(1, listReady);
- map.put(2, listWaiting);
- map.put(3, listPassed);
- return map;
- }
-
- @Override
- public List<QueueDO> getRoomQueue(String ip, List<Integer> statusList) {
- List<RoomDO> roomDOList = roomMapper.queueByIp(ip);
- Optional<RoomDO> optionalQueueDO = roomDOList.stream().filter(item -> StringUtils.hasLength(item.getIp())).findFirst();
- if (!optionalQueueDO.isPresent()) {
- return new ArrayList<QueueDO>();
- }
-
- Long roomId = optionalQueueDO.get().getRoomId();
- List<QueueDO> queueDOList = queueMapper.getRoomQueueByStatus(roomId, statusList);
- return queueDOList;
}
@Override
@@ -252,21 +200,6 @@
});
return queueDOList;
- }
-
- private Integer getDisplatSlotByQueueStatus( Integer queueStatus ) {
- if (QueueStatusEnum.READY.getStatus() == queueStatus)
- return 0;
- else if (QueueStatusEnum.ONSTAGE.getStatus() == queueStatus)
- return 0;
- else if (QueueStatusEnum.WAITING.getStatus() == queueStatus)
- return 1;
- else if (QueueStatusEnum.RECALLED.getStatus() == queueStatus)
- return 1;
- else if (QueueStatusEnum.PASSED.getStatus() == queueStatus)
- return 2;
- else
- return 0;
}
}
--
Gitblit v1.9.3