|
@@ -124,9 +124,7 @@ public class EsDenseVectorService {
|
|
|
//2. 从es中检索数据
|
|
|
q = formatQueryService.EsQueryToQuery((operateNode) tree, "patentVector", null);
|
|
|
}
|
|
|
- if (q == null) {
|
|
|
- throw new BusinessException("608", "检索式错误,请重新输入");
|
|
|
- }
|
|
|
+
|
|
|
GetImageVO imageVO = this.getImageList(dto.getProductId(), file, dto.getDescription());
|
|
|
List<Float> imageList = imageVO.getImageList();
|
|
|
List<String> getGuids = imageVO.getGetGuids();
|
|
@@ -143,8 +141,14 @@ public class EsDenseVectorService {
|
|
|
query = QueryBuilders.scriptScore(i -> i.script(script)
|
|
|
.query(org.springframework.data.elasticsearch.client.elc.QueryBuilders.matchAllQueryAsQuery()));
|
|
|
}
|
|
|
+ if (query == null) {
|
|
|
+ throw new BusinessException("608", "检索式错误,请重新输入");
|
|
|
+ }
|
|
|
builder.query(query);
|
|
|
} else {
|
|
|
+ if (q == null) {
|
|
|
+ throw new BusinessException("608", "检索式错误,请重新输入");
|
|
|
+ }
|
|
|
builder.query(q);
|
|
|
}
|
|
|
//根据申请号去重
|