malei05 3 weeks ago
parent
commit
2344681be9

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

@@ -13,6 +13,8 @@ import net.yaoyi.pipeline.model.rabbitmq.TaskImageMsg;
 import net.yaoyi.pipeline.model.rabbitmq.TaskImageResultMsg;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -56,7 +58,9 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, TaskI
             List<TaskImageIndex.MultiResult> multiResultList = new ArrayList<>(nsResult);
 
             // 维度二:namespace + taskId 维度
-            String nsTaskFilter = String.format("sourceSendPackageDeptId = %d AND taskId = %d AND id != \"%s\" AND status = 1", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), taskImageIndex.getId());
+            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);
             List<TaskImageIndex.MultiResult> nsTaskResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsTaskFilter, "task");
             multiResultList.addAll(nsTaskResult);
             taskImageIndex.setMultiResult(JacksonUtils.toJson(multiResultList));

+ 2 - 0
yyc-pipeline-model/src/main/java/net/yaoyi/pipeline/model/rabbitmq/TaskImageMsg.java

@@ -40,6 +40,8 @@ public class TaskImageMsg {
 
     public String indexTableName;
 
+    private String filterStartTime;
+
     @Data
     public static class TaskImage {
         /**