From 819e1e9f39c7a3f25cae454bd36a37391d70b367 Mon Sep 17 00:00:00 2001
From: siyang <2337720667@qq.com>
Date: Tue, 13 Aug 2024 13:20:28 +0800
Subject: [PATCH 1/3] format

---
 common/script/pom.xml                                     | 8 ++++----
 .../java/com/thing/queue/DefaultCoreConsumerService.java  | 1 +
 .../java/com/thing/thing/cache/service/ThingCache.java    | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common/script/pom.xml b/common/script/pom.xml
index f0da15d..95eaf74 100644
--- a/common/script/pom.xml
+++ b/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>
\ No newline at end of file
diff --git a/modules/dequeue/src/main/java/com/thing/queue/DefaultCoreConsumerService.java b/modules/dequeue/src/main/java/com/thing/queue/DefaultCoreConsumerService.java
index 8f11eec..ce372e0 100644
--- a/modules/dequeue/src/main/java/com/thing/queue/DefaultCoreConsumerService.java
+++ b/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());
diff --git a/modules/thing/src/main/java/com/thing/thing/cache/service/ThingCache.java b/modules/thing/src/main/java/com/thing/thing/cache/service/ThingCache.java
index b816449..ec4321e 100644
--- a/modules/thing/src/main/java/com/thing/thing/cache/service/ThingCache.java
+++ b/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());
         });
     }
 

From 6cb2106fb9edf8f9f1e13f13771f3cc0222c22ec Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 13 Aug 2024 13:32:41 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=8B=96=E6=8B=BD=202024?=
 =?UTF-8?q?=E5=B9=B48=E6=9C=8813=E6=97=A511:16:40?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dict/service/impl/IotThingDictServiceImpl.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 1a72938..702c9b2 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
@@ -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))

From 58d341c5e8fd8ca2450d4558bf1f1f52ecb8c273 Mon Sep 17 00:00:00 2001
From: lishuai <lishuai@qq.com>
Date: Tue, 13 Aug 2024 13:36:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=202024=E5=B9=B48=E6=9C=8813=E6=97=A513:36:30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IotThingSourceServiceImpl.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java
index 6850859..6cd03e2 100644
--- a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java
+++ b/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))