From b24954372390a6a0de5b7c3a407b8536b363d726 Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 19 Dec 2024 14:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7apibug=202024=E5=B9=B412?= =?UTF-8?q?=E6=9C=8819=E6=97=A514:14:26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thing/thing/api/dto/ApiEntityAttrDTO.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java b/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java index bbdfa8f..94a8b67 100644 --- a/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java +++ b/modules/thing/src/main/java/com/thing/thing/api/dto/ApiEntityAttrDTO.java @@ -90,10 +90,20 @@ public class ApiEntityAttrDTO implements Serializable { JSONArray keys1 = jsonObject.getJSONArray("keys"); JSONArray entitys = jsonObject.getJSONArray("entitys"); if(!entitys.isEmpty() && !keys1.isEmpty()){ - entityAttrMap.put(entitys.getLong(0),keys1.stream() - .map(Object::toString) - .map(Long::parseLong) - .toList()); + if(entityAttrMap.containsKey(entitys.getLong(0))){ + List longs = entityAttrMap.get(entitys.getLong(0)); + List list1 = new java.util.ArrayList<>(keys1.stream() + .map(Object::toString) + .map(Long::parseLong) + .toList()); + list1.addAll(longs); + entityAttrMap.put(entitys.getLong(0),list1); + }else{ + entityAttrMap.put(entitys.getLong(0),keys1.stream() + .map(Object::toString) + .map(Long::parseLong) + .toList()); + } } } }