Commit 73304dc2 by 黄明步

调用记录搜索相关

parent dbbc8b60
......@@ -39,6 +39,16 @@ public class ConfigApplicationController {
return Result.success("查询成功", this.configAbilityService.selectAll());
}
/**
* 查询所有应用数据
* @return 结果
*/
@GetMapping("selectApplicationAll")
public Result selectApplicationAll(){
return Result.success("查询成功", this.configApplicationService.getConfigApplicationAll());
}
/**
* 根据id查询对应的应用信息
* @param id 主键
......
......@@ -23,7 +23,8 @@ public class RecordDto implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date endTime;
private Long applicationId;
private String applicationId;
private String abilityId;
private List<String> ipScopeList;
private Integer page;
private Integer limit;
......
......@@ -355,7 +355,10 @@ public class ElasticSearchService {
}));
if (ObjUtil.isNotNull(recordDto.getApplicationId())) {
boolQuery.must(mustQuery -> mustQuery.match(mq -> mq.field("applicationId").query(recordDto.getApplicationId().toString())));
boolQuery.must(mustQuery -> mustQuery.match(mq -> mq.field("applicationId").query(recordDto.getApplicationId())));
}
if (ObjUtil.isNotNull(recordDto.getAbilityId())) {
boolQuery.must(mustQuery -> mustQuery.match(mq -> mq.field("abilityId").query(recordDto.getAbilityId())));
}
return boolQuery;
}))
......
......@@ -71,7 +71,7 @@ elasticsearch:
http: http
username: elastic
password: RQuT4eQIdIZ57waX9f87
#
#eureka:
# client:
# enabled: false
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment