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

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

common/script/pom.xml

@@ -27,10 +27,6 @@
             <groupId>com.thing.common</groupId>
             <artifactId>util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.thing.common</groupId>
-            <artifactId>core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.javadelight</groupId>
             <artifactId>delight-nashorn-sandbox</artifactId>
@@ -55,6 +51,10 @@
             <groupId>com.thing.common</groupId>
             <artifactId>tskv</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
 
     </dependencies>
 </project>

modules/dequeue/src/main/java/com/thing/queue/DefaultCoreConsumerService.java

@@ -285,6 +285,7 @@ public class DefaultCoreConsumerService extends AbstractConsumerService<Transpor
             ScriptCache scriptCache = Objects.isNull(calculationId) ? null : scriptCacheService.get(String.valueOf(calculationId));
             if (Objects.isNull(scriptCache)) {
                 entity.setOutputMsg(inputMsg);
+                return;
             }
             ScriptLanguage scriptLanguage =  ScriptLanguage.get(scriptCache.getScriptType());
             ScriptEngine scriptEngine = scriptCreateService.createScriptEngine(scriptCache.getScriptEId(), scriptLanguage, scriptCache.getScriptBody(), scriptCache.getDebug());

modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java

@@ -504,14 +504,17 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl<IotThingSourceMap
         AtomicLong aLong = new AtomicLong(0);
         List<IotThingSourceEntity> resList = Lists.newArrayList();
         if(toSourceEntity.getSort()<=sort){
-            sourceOtherEntities.stream().filter(s -> s.getSort() < sort)
-                    .sorted(Comparator.comparing(IotThingSourceEntity::getSort))
+            List<IotThingSourceEntity> list = sourceOtherEntities.stream().filter(s -> s.getSort() < sort).toList();
+            list.stream().sorted(Comparator.comparing(IotThingSourceEntity::getSort))
                     .forEach(s -> s.setSort(aLong.incrementAndGet()));
+            resList.addAll(list);
             sourceEntity.setSort(aLong.incrementAndGet());
-            mapper.update(sourceEntity);
-            sourceOtherEntities.stream()
+            resList.add(sourceEntity);
+            List<IotThingSourceEntity> list1 = sourceOtherEntities.stream().filter(s -> s.getSort() >= sort).toList();
+            list1.stream()
                     .sorted(Comparator.comparing(IotThingSourceEntity::getSort))
-                    .filter(s -> s.getSort() >= sort).forEach(s -> s.setSort(aLong.incrementAndGet()));
+                    .forEach(s -> s.setSort(aLong.incrementAndGet()));
+            resList.addAll(list1);
         }else{
             List<IotThingSourceEntity> list = sourceOtherEntities.stream().filter(s -> s.getSort() <= sort).toList();
             list.stream().sorted(Comparator.comparing(IotThingSourceEntity::getSort))

modules/thing/src/main/java/com/thing/thing/cache/service/ThingCache.java

@@ -158,7 +158,7 @@ public final class ThingCache {
 
     public void printStats() {
         thingMap.forEach((topic, queue) -> {
-            log.info("---dataMap-内存主题:{}----->数据量:{}------{}", topic, queue.size(), queue);
+            log.info("---dataMap-内存主题:{}----->数据量:{}", topic, queue.size());
         });
     }
 

modules/thing/src/main/java/com/thing/thing/dict/service/impl/IotThingDictServiceImpl.java

@@ -404,14 +404,18 @@ public class IotThingDictServiceImpl extends BaseServiceImpl<IotThingDictMapper,
         AtomicLong aLong = new AtomicLong(0);
         List<IotThingDictEntity> resList = Lists.newArrayList();
         if(toDictEntity.getSort()<=sort){
-            iotThingDictEntities.stream().filter(s -> s.getSort() < sort)
+            List<IotThingDictEntity> list = iotThingDictEntities.stream().filter(s -> s.getSort() < sort).toList();
+            list.stream()
                     .sorted(Comparator.comparing(IotThingDictEntity::getSort))
                     .forEach(s -> s.setSort(aLong.incrementAndGet()));
+            resList.addAll(list);
             iotThingDictEntity.setSort(aLong.incrementAndGet());
-           mapper.update(iotThingDictEntity);
-            iotThingDictEntities.stream()
+            resList.add(iotThingDictEntity);
+            List<IotThingDictEntity> list1 = iotThingDictEntities.stream().filter(s -> s.getSort() >= sort).toList();
+            list1.stream()
                     .sorted(Comparator.comparing(IotThingDictEntity::getSort))
-                    .filter(s -> s.getSort() >= sort).forEach(s -> s.setSort(aLong.incrementAndGet()));
+                    .forEach(s -> s.setSort(aLong.incrementAndGet()));
+            resList.addAll(list1);
         }else{
             List<IotThingDictEntity> list = iotThingDictEntities.stream().filter(s -> s.getSort() <= sort).toList();
             list.stream().sorted(Comparator.comparing(IotThingDictEntity::getSort))