malei05 1 неделя назад
Родитель
Сommit
f69a8fcb27

+ 9 - 5
fn-opensearch/src/main/java/net/yaoyi/pipeline/opensearch/OpenSearchHandler.java

@@ -102,14 +102,18 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, TaskI
     }
     }
 
 
     private void saveByTask(TaskImageMsg taskImageMsg) {
     private void saveByTask(TaskImageMsg taskImageMsg) {
-        List<TaskImageIndex> addList = new ArrayList<>();
-        List<TaskImageIndex> deleteList = new ArrayList<>();
+        final List<TaskImageIndex> addList = new ArrayList<>();
+        final List<TaskImageIndex> deleteList = new ArrayList<>();
 
 
         List<TaskImageIndex> taskImageList = fetchByTaskId(taskImageMsg.getIndexTableName(), taskImageMsg.getNamespace(), taskImageMsg.getTaskId());
         List<TaskImageIndex> taskImageList = fetchByTaskId(taskImageMsg.getIndexTableName(), taskImageMsg.getNamespace(), taskImageMsg.getTaskId());
         if (taskImageMsg.getStatus() == 0) {
         if (taskImageMsg.getStatus() == 0) {
-            deleteList = taskImageList;
+            deleteList.addAll(taskImageList);
         } else {
         } else {
-            Map<String, TaskImageIndex> map = taskImageList.stream().collect(Collectors.toMap(TaskImageIndex::getImage, Function.identity()));
+            Map<String, TaskImageIndex> map = taskImageList.stream().collect(Collectors.toMap(TaskImageIndex::getImage,
+                    Function.identity(), (a, b) -> {
+                        deleteList.add(b);
+                        return a;
+                    }));
             List<TaskImageMsg.TaskImage> images = taskImageMsg.getImages();
             List<TaskImageMsg.TaskImage> images = taskImageMsg.getImages();
             for (TaskImageMsg.TaskImage imageInfo : images) {
             for (TaskImageMsg.TaskImage imageInfo : images) {
                 TaskImageIndex exists = map.remove(imageInfo.getImage());
                 TaskImageIndex exists = map.remove(imageInfo.getImage());
@@ -125,7 +129,7 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, TaskI
             }
             }
 
 
             if (!map.isEmpty()) {
             if (!map.isEmpty()) {
-                deleteList = new ArrayList<>(map.values());
+                 deleteList.addAll(map.values());
             }
             }
         }
         }