Merge pull request 'master' (#79) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/79

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 {
 

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<Long> longs = entityAttrMap.get(entitys.getLong(0));
+                        List<Long> 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());
+                    }
+
                 }
             }
         }

pom.xml

@@ -626,6 +626,12 @@
                 <artifactId>visual-design</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>com.thing.modules</groupId>
+                <artifactId>cbam</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <!-- =================================== 内部依赖: tools模块 ======================================= -->
             <dependency>
                 <groupId>com.thing.tools</groupId>
@@ -748,14 +754,7 @@
 
 
     <repositories>
-        <repository>
-            <id>public</id>
-            <name>ali</name>
-            <url>https://maven.aliyun.com/repository/central</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
+
         <!-- 若想引用modbus4j需要引入下列repository id:ias-snapshots id:ias-releases 两个 -->
         <repository>
             <releases>