From c05a87199a66dfd912ac83270b26aeb9afd09c2d Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期二, 08 四月 2025 10:19:29 +0800
Subject: [PATCH] 仅注解
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/callingscreen/CallingScreenController.java | 2 +-
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/service/callingscreen/CallingScreenServiceImpl.java | 5 +++++
README.md | 7 +++++--
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index efe3c14..dfeceab 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,9 @@
07. 妫�鏌ラ」杩涘叆鍒� [瀹夎涓璢 鏃讹紝鎷� [宸查鐢╙ + 鍏锋湁浜插拰鎬х殑 妫�鏌ラ」 鏉ヤ緷闄勮妫�鏌ラ」
### 鍙彿
-01. 澶у睆 妫�鏌�/棰嗙敤 銆� 涓嶇敤鏄剧ず瀹夎鐩稿叧淇℃伅 浜插拰妫�鏌ラ」闇�瑕佸湪鍚屼竴鍒楁樉绀�, 鍚﹀垯浜插拰椤硅窡涓婚」鍒嗗紑鍦ㄤ笉鍚屽垪
-02. 灏忓睆 妫�鏌�/棰嗙敤 + 鏄剧ず瀹夎鐩稿叧淇℃伅锛屼翰鍜岃窡闅忓墠闇�瑕佸厛鎶婃偅鑰呭垎寮�鎴愰鐢ㄧ浉鍏崇殑鎮ｈ�呭拰瀹夎鐩稿叧鐨勬偅鑰咃紝鍩轰簬鎮ｈ�呭拰鍐呴儴搴忓彿璺熼殢
+01. 澶у睆 妫�鏌�/棰嗙敤 銆� 涓嶇敤鏄剧ず瀹夎鐩稿叧淇℃伅 浜插拰妫�鏌ラ」闇�瑕佸湪鍚屼竴鍒楁樉绀�, 鍚﹀垯浜插拰椤硅窡涓婚」鍒嗗紑鍦ㄤ笉鍚屽垪
+02. 澶у睆锛� 涓昏瑙ｅ喅 闈炲垎娴佹偅鑰呴『搴忛棶棰� 銆愭帓闃熶腑銆戙�愯繃鍙�-鎺掗槦銆�
+03. 灏忓睆 妫�鏌�/棰嗙敤 + 鏄剧ず瀹夎鐩稿叧淇℃伅锛屼翰鍜岃窡闅忓墠闇�瑕佸厛鎶婃偅鑰呭垎寮�鎴愰鐢ㄧ浉鍏崇殑鎮ｈ�呭拰瀹夎鐩稿叧鐨勬偅鑰咃紝鍩轰簬鎮ｈ�呭拰鍐呴儴搴忓彿璺熼殢
+04. 灏忓睆锛� 涓昏瑙ｅ喅 妫�鏌�/棰嗙敤 鐩稿叧鎮ｈ�� 鍜� 瀹夎鐩稿叧鎮ｈ�� 闇�瑕佸垎寮�澶勭悊闂 鍚﹀垯褰撴湁涓や釜鍙婁互涓婁翰鍜岄」鏃朵細鍙戠敓涓嶇煡閬撴槸璺熼殢妫�鏌ョ浉鍏抽」鐩繕鏄畨瑁呯浉鍏抽」鐩�
+
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 09d3508..2e90bad 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
@@ -40,7 +40,7 @@
private CallingScreenService callingScreenService;
@GetMapping("/display-col-info")
- @Operation(summary = "鏄剧ず鍒椾俊鎭�")
+ @Operation(summary = "鍒椾笂鏄剧ず鐨勬鏌ョ被鍨嬪悕绉�")
@PermitAll
public CommonResult<Map<Integer, List<String>>> displayColInfo()
{
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 db9a436..6a9acd0 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
@@ -56,9 +56,14 @@
checkTypePageReqVO.setPageSize(-1);
checkTypePageReqVO.setCallingColumn(-1); // 鍒楀彿 -1 鐨勪笉鏄剧ず
PageResult<CheckTypeDO> pageResult = checkTypeMapper.selectPageForCallingScreen(checkTypePageReqVO);
+
+ // 鏄剧ず鍒� 鍖呭惈鐨勬鏌ョ被鍨嬪垪琛�
Map<Integer, List<CheckTypeDO>> 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());
--
Gitblit v1.9.3