From 58d341c5e8fd8ca2450d4558bf1f1f52ecb8c273 Mon Sep 17 00:00:00 2001 From: lishuai Date: Tue, 13 Aug 2024 13:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E5=88=86=E6=9E=90=E6=8B=96?= =?UTF-8?q?=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 resList = Lists.newArrayList(); if(toSourceEntity.getSort()<=sort){ - sourceOtherEntities.stream().filter(s -> s.getSort() < sort) - .sorted(Comparator.comparing(IotThingSourceEntity::getSort)) + List 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 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 list = sourceOtherEntities.stream().filter(s -> s.getSort() <= sort).toList(); list.stream().sorted(Comparator.comparing(IotThingSourceEntity::getSort))