init

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

@@ -53,14 +53,15 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, TaskI
             }
 
             // 维度一：namespace 维度
-            String nsFilter = String.format("sourceSendPackageDeptId = %d AND taskId != %d AND status = 1", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId());
+            String fileterStartDateTime = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            String nsFilter = String.format("sourceSendPackageDeptId = %d AND taskId != %d AND status = 1 AND taskTime > \"%s\"",
+                    taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), fileterStartDateTime);
             List<TaskImageIndex.MultiResult> nsResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsFilter, "namespace");
             List<TaskImageIndex.MultiResult> multiResultList = new ArrayList<>(nsResult);
 
             // 维度二：namespace + taskId 维度
-            String fileterStartDateTime = LocalDateTime.now().minusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-            String nsTaskFilter = String.format("sourceSendPackageDeptId = %d AND taskId = %d AND id != \"%s\" AND status = 1 AND taskTime > \"%s\"",
-                    taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), taskImageIndex.getId(), fileterStartDateTime);
+            String nsTaskFilter = String.format("sourceSendPackageDeptId = %d AND taskId = %d AND id != \"%s\" AND status > 0",
+                    taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), taskImageIndex.getId());
             List<TaskImageIndex.MultiResult> nsTaskResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsTaskFilter, "task");
             multiResultList.addAll(nsTaskResult);
             taskImageIndex.setMultiResult(JacksonUtils.toJson(multiResultList));