|
@@ -59,6 +59,7 @@ import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Map.Entry;
|
|
|
import java.util.Objects;
|
|
|
+import java.util.Set;
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
import java.util.stream.Collectors;
|
|
|
import javax.annotation.Resource;
|
|
@@ -514,6 +515,11 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
|
|
|
if(CollUtil.isEmpty(proFolderList)){
|
|
|
return;
|
|
|
}
|
|
|
+ //先删除旧的id关系数据
|
|
|
+ Set<Long> removeIdList = proFolderList.stream().map(fs -> fs.getId()).collect(Collectors.toSet());
|
|
|
+ folderSceneService.removeByIds(removeIdList);
|
|
|
+
|
|
|
+ //写入新的id关系数据
|
|
|
List<FolderScene> list = proFolderList.stream().map(fs -> {
|
|
|
FolderScene plusFs = new FolderScene();
|
|
|
plusFs.setFolderId(fs.getFolderId());
|