token管理查询接口参数修改

This commit is contained in:
liuzhaotian
2025-03-05 11:59:44 +08:00
parent 8374365163
commit 418ac7cc79
5 changed files with 42 additions and 34 deletions
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
import co.elastic.clients.elasticsearch.ElasticsearchClient;
import co.elastic.clients.elasticsearch._types.ElasticsearchException;
import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch.core.DeleteByQueryRequest;
import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
import co.elastic.clients.elasticsearch.core.SearchRequest;
@@ -216,26 +217,25 @@ public class EsUtils {
}
}
public void deleteEsDocument(String filedName1,String filedName2, Long value1,Long value2, String index) {
public void deleteEsDocument(String fieldName1,String fieldName2, Long value1,Long value2, String index) {
DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
builder.index(index);
builder.query(q->q.bool(b->b.filter(f->{
f.term(t->t.field(filedName1).value(value1));
f.term(t->t.field(filedName2).value(value2));
return f;
})));
builder.query(q -> q.bool(b -> b.filter(
Query.of(q1 -> q1.term(t -> t.field(fieldName1).value(value1))),
Query.of(q2 -> q2.term(t -> t.field(fieldName2).value(value2)))
)));
try {
elasticsearchClient.deleteByQuery(builder.build());
} catch (IOException | ElasticsearchException e) {
log.error("ES文档删除失败:", e.getMessage());
log.error("ES文档删除失败:{}", e.getMessage());
throw new ServiceException(ES_DATA_ERROR);
}
}
public void deleteEsDocument(String filedName1,String filedName2, Long value1,List<Long> values2, String index) {
List<FieldValue> fieldValues = values2.stream().map(FieldValue::of).toList();
@@ -243,11 +243,10 @@ public class EsUtils {
DeleteByQueryRequest.Builder builder = new DeleteByQueryRequest.Builder();
builder.index(index);
builder.query(q->q.bool(b->b.filter(f->{
f.term(t->t.field(filedName1).value(value1));
f.terms(t->t.field(filedName2).terms(v2->v2.value(fieldValues)));
return f;
})));
builder.query(q-> q.bool(b-> b.filter(
Query.of(q1->q1.term(t->t.field(filedName1).value(value1))),
Query.of(q2-> q2.terms(t->t.field(filedName2).terms(v2-> v2.value(fieldValues))))
)));
try {
elasticsearchClient.deleteByQuery(builder.build());