From 870f647e1ef6b15112d532f3e283000289c14182 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Wed, 11 Sep 2024 15:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=AF=BC=E5=85=A5=202024?=
 =?UTF-8?q?=E5=B9=B49=E6=9C=8811=E6=97=A515:47:40?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thing/thing/dict/service/impl/IotThingDictServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
index 139ca07..7685556 100644
--- a/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
+++ b/modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java
@@ -251,7 +251,7 @@ public class IotThingDictServiceImpl extends BaseServiceImpl<IotThingDictMapper,
             throw new SysException("字典编码和字典类型不能为空,请检查下excel数据");
         }
         Map<String, Long> codeCountMap = sheetData.stream()
-                .collect(Collectors.groupingBy(IotThingDictExcel::getCode, Collectors.counting())); // 使用 groupingBy 收集器按照 code 进行分组，并计数
+                .collect(Collectors.groupingBy(s-> s.getCode()+":"+s.getGroupName(), Collectors.counting())); // 使用 groupingBy 收集器按照 code 进行分组，并计数
         String duplicates = codeCountMap.entrySet().stream()
                 .filter(entry -> entry.getValue() > 1) // 过滤出计数大于 1 的 entry
                 .map(Map.Entry::getKey) // 获取过滤后的 entry 的 key，即重复的 code 值