字典拖拽

2024年8月13日11:16:40

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))