diff --git a/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java b/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java index 382f475..6cd5daa 100644 --- a/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java +++ b/common/script/src/main/java/com/thing/ScriptCreateServiceImpl.java @@ -33,9 +33,7 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -/** - * @author zhenghh. 2022-12-27 - **/ + @Service public class ScriptCreateServiceImpl implements ScriptCreateService { 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..7b2307b 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,21 @@ 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()); + } + } } } diff --git a/pom.xml b/pom.xml index 991ca6a..f02b49e 100644 --- a/pom.xml +++ b/pom.xml @@ -626,6 +626,12 @@ visual-design ${project.version} + + + com.thing.modules + cbam + ${project.version} + com.thing.tools @@ -748,14 +754,7 @@ - - public - ali - https://maven.aliyun.com/repository/central - - true - - +