From 68ff33beff11310e830b0615b5a81f83fad0f683 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 08 十一月 2026 23:33:14 +0800
Subject: [PATCH] ai优化
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 142 +++++++++++++++++++++++++++++++++++------------
1 files changed, 106 insertions(+), 36 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 747faea..ef9a3cf 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
@@ -2,15 +2,11 @@
import cn.hutool.extra.servlet.ServletUtil;
import cn.lihu.jh.framework.common.pojo.CommonResult;
-import cn.lihu.jh.framework.common.pojo.PageResult;
import cn.lihu.jh.framework.common.util.object.BeanUtils;
-import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.CheckTypePageReqVO;
import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
-import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
+import cn.lihu.jh.module.ecg.dal.mysql.checktype.CheckTypeMapper;
import cn.lihu.jh.module.ecg.service.callingscreen.CallingScreenService;
-import cn.lihu.jh.module.ecg.service.checktype.CheckTypeService;
-import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j;
@@ -20,7 +16,6 @@
import javax.annotation.Resource;
import javax.annotation.security.PermitAll;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -39,8 +34,16 @@
@Resource
private CallingScreenService callingScreenService;
+ /** 鐢ㄤ簬缁欏睆骞曟暟鎹ˉ銆屾帓闃熷彿鍓嶇紑銆嶏紙check_type.seq_prefix锛� */
+ @Resource
+ private CheckTypeMapper checkTypeMapper;
+
+ /** 銆愰噸鍙�戠敤浜庣粰灞忓箷鏁版嵁琛�"鏈�杩戜竴娆″彨鍙疯褰昳d"锛坈all_patient锛� */
+ @Resource
+ private cn.lihu.jh.module.ecg.dal.mysql.call.CallMapper callMapper;
+
@GetMapping("/display-col-info")
- @Operation(summary = "鏄剧ず鍒椾俊鎭�")
+ @Operation(summary = "鍒椾笂鏄剧ず鐨勬鏌ョ被鍨嬪悕绉�")
@PermitAll
public CommonResult<Map<Integer, List<String>>> displayColInfo()
{
@@ -51,21 +54,22 @@
@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.callingData();
+ Map<Integer, List<QueueDO>> map = callingScreenService.getBigScreenPatient();
- Map<Integer, Map<Integer, List<ScreenQueueRespVO>>> mapVO = new HashMap<>();
+ Map<Integer, List<ScreenQueueRespVO>> mapVO = new HashMap<>();
+ // 灞忓箷瑕佹樉绀恒�屽墠缂� + 鎺掗槦鍙枫�嶏紝璁惧鏈櫥褰曟嬁涓嶅埌妫�鏌ラ」鐩瓧鍏革紝鏁呯敱鍚庣涓�骞朵笅鍙戯紙姣忔璇锋眰璇讳竴娆★級
+ Map<Integer, String> seqPrefixMap = getSeqPrefixMap();
+ // 銆愰噸鍙�戜竴骞朵笅鍙�"鏈�杩戜竴娆″彨鍙疯褰昳d"锛屽睆骞曟嵁姝ら噸鏂版挱鎶�
+ Map<String, Long> callIdMap = getLatestCallIdMap();
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);
+ fillSeqPrefix(screenQueueRespVOList, seqPrefixMap);
+ fillCallId(screenQueueRespVOList, callIdMap);
+ mapVO.put(displayCol, screenQueueRespVOList);
});
return success( mapVO );
@@ -74,30 +78,96 @@
@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<Integer> queueStatusList = new ArrayList<>();
- queueStatusList.add(QueueStatusEnum.RECALLED.getStatus());
- queueStatusList.add(QueueStatusEnum.RECALLED_INSTALL.getStatus());
- queueStatusList.add(QueueStatusEnum.READY.getStatus());
- queueStatusList.add(QueueStatusEnum.ONSTAGE.getStatus());
- queueStatusList.add(QueueStatusEnum.RECEIVED.getStatus());
- queueStatusList.add(QueueStatusEnum.INSTALLING.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED.getStatus());
- queueStatusList.add(QueueStatusEnum.PASSED_INSTALL.getStatus());
- queueStatusList.add(QueueStatusEnum.AFFINITY.getStatus());
- queueStatusList.add(QueueStatusEnum.AFFINITY_INSTALL.getStatus());
- List<QueueDO> queueDOList = callingScreenService.getRoomQueue(reqIp, queueStatusList);
-
-// List<QueueDO> passedList = queueDOList.stream().filter(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus() || queue.getStatus() == QueueStatusEnum.PASSED_INSTALL.getStatus()).toList();
-// queueDOList.removeIf(queue -> queue.getStatus() == QueueStatusEnum.PASSED.getStatus());
+ 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(queueDOList, ScreenQueueRespVO.class));
-// mapVO.put(2, BeanUtils.toBean(passedList, ScreenQueueRespVO.class));
+ List<ScreenQueueRespVO> waitingVOList = BeanUtils.toBean(queueDOList1, ScreenQueueRespVO.class);
+ List<ScreenQueueRespVO> installVOList = BeanUtils.toBean(queueDOList2, ScreenQueueRespVO.class);
+ // 灞忓箷瑕佹樉绀恒�屽墠缂� + 鎺掗槦鍙枫�嶏紝璁惧鏈櫥褰曟嬁涓嶅埌妫�鏌ラ」鐩瓧鍏革紝鏁呯敱鍚庣涓�骞朵笅鍙戯紙姣忔璇锋眰璇讳竴娆★級
+ Map<Integer, String> seqPrefixMap = getSeqPrefixMap();
+ Map<String, Long> callIdMap = getLatestCallIdMap();
+ fillSeqPrefix(waitingVOList, seqPrefixMap);
+ fillSeqPrefix(installVOList, seqPrefixMap);
+ fillCallId(waitingVOList, callIdMap);
+ fillCallId(installVOList, callIdMap);
+ mapVO.put(1, waitingVOList);
+ mapVO.put(2, installVOList);
return success( mapVO );
}
+ /**
+ * 缁欏睆骞曟暟鎹ˉ涓娿�屾帓闃熷彿鏄剧ず鍓嶇紑銆�= {@code check_type.seq_prefix}銆�
+ *
+ * <p>銆愬彿缁熶竴锛堟湰闇�姹傦級銆戞帓闃熷彿鎸夋鏌ラ」鐩悇鑷紪鍙凤紝涓嶅悓妫�鏌ラ」鐩細鍑虹幇鐩稿悓鏁板瓧锛�
+ * 灞忓箷涓婂繀椤诲甫鍓嶇紑鎵嶅垎寰楁竻锛堜緥锛欰5 / B5锛夈�傚睆骞曡澶囦笉鐧诲綍銆佹棤娉曡皟鐢ㄦ鏌ラ」鐩帴鍙ｏ紝
+ * 鍥犳鍦ㄨ繖閲岃ˉ榻愩��
+ *
+ * <p>姣忔璇锋眰鏌ヤ竴娆″叏琛ㄥ缓鏄犲皠锛堟鏌ラ」鐩彧鏈夊崄鍑犱釜锛岄噺绾у緢灏忥級锛�
+ * 涓嶅仛闀挎湡缂撳瓨锛岄伩鍏嶇鐞嗗憳鏀逛簡鍓嶇紑鍚庡睆骞曚竴鐩存樉绀烘棫鍊笺��
+ * 鏌ヤ笉鍒伴厤缃椂鐣欑┖涓测�斺�斿畞鍙彧鏄剧ず鏁板瓧锛屼篃涓嶈璁╁睆骞曟姤閿欐垨绌虹櫧銆�
+ */
+ private void fillSeqPrefix(List<ScreenQueueRespVO> voList, Map<Integer, String> seqPrefixMap) {
+ if (voList == null || voList.isEmpty() || seqPrefixMap == null) {
+ return;
+ }
+ voList.forEach(vo -> vo.setSeqPrefix(seqPrefixMap.getOrDefault(vo.getBookCheckType(), "")));
+ }
+
+ /* ==================== 閲嶅彨锛氫笅鍙�"鏈�杩戜竴娆″彨鍙疯褰昳d" ==================== */
+
+ /**
+ * 缁欏睆骞曟暟鎹ˉ涓� {@code callId}锛堣鎮ｈ�呮渶杩戜竴娆″彨鍙疯褰曠殑 id锛夈��
+ *
+ * <p>涓轰粈涔堥渶瑕侊細灞忓箷鎾姤闈�"鏁版嵁鍙樺寲"瑙﹀彂 鈥斺�� 澶у睆鍒ゆ柇"鏌愭偅鑰呮柊鍑虹幇鍦ㄥ彨鍙峰垪"銆�
+ * 璇婇棿灞忓垽鏂�"璇婁腑绗竴浜哄彉鍖�"銆傝�屽尰鐢熺偣銆岄噸鍙�嶆椂**鎮ｈ�呰繕鏄偅涓汉銆佽瘖瀹よ繕鏄偅涓瘖瀹�**锛�
+ * 闃熷垪鏁版嵁涓�鐐规病鍙橈紝涓ゅ潡灞忚嚜鐒朵笉浼氬啀鎾�傞噸鍙細鏂板涓�鏉″彨鍙疯褰曪紙call_patient锛夛紝
+ * 鎶婂畠鐨� id 涓嬪彂鍚庯紝灞忓箷鍙鍙戠幇 callId 鍙樹簡灏遍噸鏂版挱鎶ャ��
+ */
+ private void fillCallId(List<ScreenQueueRespVO> voList, Map<String, Long> callIdMap) {
+ if (voList == null || voList.isEmpty() || callIdMap == null || callIdMap.isEmpty()) {
+ return;
+ }
+ voList.forEach(vo -> {
+ if (null != vo.getPatId()) {
+ vo.setCallId(callIdMap.get(vo.getPatId()));
+ }
+ });
+ }
+
+ /** 涓�娆℃煡璇㈠彇鍒般�屾偅鑰呯紪鍙� 鈫� 鏈�杩戜竴娆″彨鍙疯褰� id銆嶏紱澶辫触鏃惰繑鍥炵┖鏄犲皠锛堝睆骞曟寜鑰侀�昏緫鎾姤锛� */
+ private Map<String, Long> getLatestCallIdMap() {
+ try {
+ Map<String, Long> map = new HashMap<>();
+ for (Map<String, Object> row : callMapper.selectLatestCallIds()) {
+ Object patId = row.get("patId");
+ Object callId = row.get("callId");
+ if (null != patId && callId instanceof Number) {
+ map.put(String.valueOf(patId), ((Number) callId).longValue());
+ }
+ }
+ return map;
+ } catch (Exception e) {
+ log.error("[getLatestCallIdMap] 璇诲彇鏈�杩戝彨鍙疯褰曞け璐ワ紝閲嶅彨灏嗕笉浼氳Е鍙戝睆骞曢噸鎾�", e);
+ return new HashMap<>();
+ }
+ }
+
+ /** 璇讳竴娆℃鏌ラ」鐩厤缃紝寰楀埌銆屾鏌ラ」鐩�� 鈫� 鎺掗槦鍙峰墠缂�銆嶆槧灏勶紱澶辫触鏃惰繑鍥炵┖鏄犲皠锛堝睆骞曞彧鏄剧ず鍙凤級 */
+ private Map<Integer, String> getSeqPrefixMap() { try {
+ return checkTypeMapper.simpleCheckTypeList().stream()
+ .filter(checkType -> null != checkType.getValue())
+ .collect(Collectors.toMap(CheckTypeDO::getValue,
+ checkType -> null == checkType.getSeqPrefix() ? "" : checkType.getSeqPrefix(),
+ (a, b) -> a));
+ } catch (Exception e) {
+ log.error("[getSeqPrefixMap] 璇诲彇妫�鏌ラ」鐩墠缂�澶辫触锛屽睆骞曞皢鍙樉绀哄彿", e);
+ return new HashMap<>();
+ }
+ }
+
}
--
Gitblit v1.9.3