|
@@ -51,12 +51,12 @@ public class OpenSearchHandler implements PojoRequestHandler<TaskImageMsg, TaskI
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 维度一:namespace 维度
|
|
// 维度一:namespace 维度
|
|
|
- String nsFilter = String.format("sourceSendPackageDeptId = %d AND taskId != %d AND status > 0", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId());
|
|
|
|
|
|
|
+ String nsFilter = String.format("sourceSendPackageDeptId = %d AND taskId != %d AND status = 1", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId());
|
|
|
List<TaskImageIndex.MultiResult> nsResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsFilter, "namespace");
|
|
List<TaskImageIndex.MultiResult> nsResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsFilter, "namespace");
|
|
|
List<TaskImageIndex.MultiResult> multiResultList = new ArrayList<>(nsResult);
|
|
List<TaskImageIndex.MultiResult> multiResultList = new ArrayList<>(nsResult);
|
|
|
|
|
|
|
|
// 维度二:namespace + taskId 维度
|
|
// 维度二:namespace + taskId 维度
|
|
|
- String nsTaskFilter = String.format("sourceSendPackageDeptId = %d AND taskId = %d AND id != \"%s\" AND status > 0", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), taskImageIndex.getId());
|
|
|
|
|
|
|
+ String nsTaskFilter = String.format("sourceSendPackageDeptId = %d AND taskId = %d AND id != \"%s\" AND status = 1", taskImageIndex.getSourceSendPackageDeptId(), taskImageIndex.getTaskId(), taskImageIndex.getId());
|
|
|
List<TaskImageIndex.MultiResult> nsTaskResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsTaskFilter, "task");
|
|
List<TaskImageIndex.MultiResult> nsTaskResult = knnSearch(taskImageMsg.getIndexTableName(), namespace, taskImageIndex.getVector(), nsTaskFilter, "task");
|
|
|
multiResultList.addAll(nsTaskResult);
|
|
multiResultList.addAll(nsTaskResult);
|
|
|
taskImageIndex.setMultiResult(JacksonUtils.toJson(multiResultList));
|
|
taskImageIndex.setMultiResult(JacksonUtils.toJson(multiResultList));
|