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 | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 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 886aeaf..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,8 +1,14 @@ package cn.lihu.jh.module.ecg.config; import cn.lihu.jh.module.ecg.Utils; +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 lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationStartedEvent; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; @@ -11,24 +17,48 @@ import java.time.LocalTime; import java.util.List; -import static cn.lihu.jh.module.ecg.Constants.ECG_OPENING_TIME_KEY; -import static cn.lihu.jh.module.ecg.Constants.ECG_QUEUE_READY_MAX_KEY; +import static cn.lihu.jh.module.ecg.Constants.*; @Component +@Slf4j public class MySpringEventListener { @Resource private ConfigApi configApi; @Resource - private QueueService queueService; + private DictDataApi dictDataApi; + + @Resource + private EcgConfigService ecgConfigService; + + @Resource + QueueService queueService; + + @Resource + QueueSequenceService queueSequenceService; + + @Resource + CallingScreenService callingScreenService; @EventListener public void onApplicationEvent(ApplicationStartedEvent event) { - System.out.println("搴旂敤鍚姩瀹屾垚锛岀郴缁熷垵濮嬨�傘�傘��"); + log.info("搴旂敤鍚姩瀹屾垚锛岀郴缁熷垵濮嬨�傘�傘��"); - Integer queueReadyMax = Integer.valueOf(configApi.getConfigValueByKey(ECG_QUEUE_READY_MAX_KEY)); - queueService.setQueueReadyMax( queueReadyMax ); + queueService.initCheckType(); + + 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); + callingScreenService.getDisplayColInfo(); + + // 棰勭害搴忓彿琛� 澶勭悊閫昏緫 + queueSequenceService.initQueueSequenceTable(); String strOpenCloseTime = configApi.getConfigValueByKey(ECG_OPENING_TIME_KEY); List<LocalTime> list = Utils.parseOpeningTime(strOpenCloseTime); @@ -45,6 +75,6 @@ queueService.startBiz(); } - queueService.resetScheduler(); + ecgConfigService.resetScheduler(); } } -- Gitblit v1.9.3