From 2bc90e242eceb83d9aa80d48ea9f991c0f9b99c6 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 12 十二月 2024 19:47:57 +0800
Subject: [PATCH] 工位选择界面 诊室按照room id排序
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/MySpringEventListener.java | 41 +++++++++++++++--------------------------
1 files changed, 15 insertions(+), 26 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/MySpringEventListener.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/MySpringEventListener.java
index f9fab35..dc9e189 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/MySpringEventListener.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/config/MySpringEventListener.java
@@ -1,16 +1,13 @@
package cn.lihu.jh.module.ecg.config;
-import cn.lihu.jh.framework.common.exception.ServiceException;
-import cn.lihu.jh.framework.common.exception.enums.GlobalErrorCodeConstants;
import cn.lihu.jh.module.ecg.Utils;
-import cn.lihu.jh.module.ecg.enums.ErrorCodeConstants;
import cn.lihu.jh.module.ecg.service.callingscreen.BigScreenConfig;
import cn.lihu.jh.module.ecg.service.callingscreen.CallingScreenService;
import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
import cn.lihu.jh.module.ecg.service.queue.QueueService;
+import cn.lihu.jh.module.ecg.service.queuesequence.QueueSequenceService;
import cn.lihu.jh.module.infra.api.config.ConfigApi;
import cn.lihu.jh.module.system.api.dict.DictDataApi;
-import cn.lihu.jh.module.system.api.dict.dto.DictDataRespDTO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.context.event.ApplicationStartedEvent;
import org.springframework.context.event.EventListener;
@@ -18,10 +15,7 @@
import javax.annotation.Resource;
import java.time.LocalTime;
-import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import static cn.lihu.jh.module.ecg.Constants.*;
@@ -42,34 +36,29 @@
QueueService queueService;
@Resource
+ QueueSequenceService queueSequenceService;
+
+ @Resource
CallingScreenService callingScreenService;
@EventListener
public void onApplicationEvent(ApplicationStartedEvent event) {
log.info("搴旂敤鍚姩瀹屾垚锛岀郴缁熷垵濮嬨�傘�傘��");
- String strQueueReadyMax = configApi.getConfigValueByKey(ECG_QUEUE_READY_MAX_KEY);
- int[] queueReadyMax = Arrays.stream(strQueueReadyMax.split(","))
- .mapToInt(Integer::parseInt)
- .toArray();
- List<DictDataRespDTO> dictDataRespDTOList = dictDataApi.getDictDataList("ecg_check_type");
- if ( dictDataRespDTOList.size() != queueReadyMax.length) {
- log.error(ErrorCodeConstants.ECG_CONFIG_ERROR.getMsg());
- }
+ queueService.initCheckType();
- Integer checkTypeNum = dictDataRespDTOList.size() < queueReadyMax.length ? dictDataRespDTOList.size() : queueReadyMax.length;
- Map max = new HashMap<Integer, Integer>();
- for (int i=0; i<checkTypeNum; i++) {
- max.put( Integer.valueOf(dictDataRespDTOList.get(i).getValue()), queueReadyMax[i]);
- }
- queueService.setCheckTypeReadyMax( max );
+ ecgConfigService.readTimeSlotConfig();
BigScreenConfig bigScreenConfig = new BigScreenConfig();
- Integer waitingSize = Integer.valueOf(configApi.getConfigValueByKey(ECG_SCREEN_PANE_WAITING_KEY));
- Integer passedSize = Integer.valueOf(configApi.getConfigValueByKey(ECG_SCREEN_PANE_PASSED_KEY));
- bigScreenConfig.setWaitingSize( waitingSize);
- bigScreenConfig.setPassedSize( passedSize);
- callingScreenService.setBigScreenConfig(bigScreenConfig);
+// Integer waitingSize = Integer.valueOf(configApi.getConfigValueByKey(ECG_SCREEN_PANE_WAITING_KEY));
+// Integer passedSize = Integer.valueOf(configApi.getConfigValueByKey(ECG_SCREEN_PANE_PASSED_KEY));
+// bigScreenConfig.setWaitingSize( waitingSize);
+// bigScreenConfig.setPassedSize( passedSize);
+// callingScreenService.setBigScreenConfig(bigScreenConfig);
+ callingScreenService.getDisplayColInfo();
+
+ // 棰勭害搴忓彿琛� 澶勭悊閫昏緫
+ queueSequenceService.initQueueSequenceTable();
String strOpenCloseTime = configApi.getConfigValueByKey(ECG_OPENING_TIME_KEY);
List<LocalTime> list = Utils.parseOpeningTime(strOpenCloseTime);
--
Gitblit v1.9.3