调用记录搜索相关

src/main/java/com/gxmailu/ocrCloudPlatform/controller/ConfigApplicationController.java

@@ -39,6 +39,16 @@ public class ConfigApplicationController {
         return Result.success("查询成功", this.configAbilityService.selectAll());
         return Result.success("查询成功", this.configAbilityService.selectAll());
     }
     }
 
 
+
+    /**
+     * 查询所有应用数据
+     * @return 结果
+     */
+    @GetMapping("selectApplicationAll")
+    public Result selectApplicationAll(){
+        return Result.success("查询成功", this.configApplicationService.getConfigApplicationAll());
+    }
+
     /**
     /**
      * 根据id查询对应的应用信息
      * 根据id查询对应的应用信息
      * @param id 主键
      * @param id 主键

src/main/java/com/gxmailu/ocrCloudPlatform/dto/RecordDto.java

@@ -23,7 +23,8 @@ public class RecordDto implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
     private Date endTime;
-    private Long applicationId;
+    private String applicationId;
+    private String abilityId;
     private List<String> ipScopeList;
     private List<String> ipScopeList;
     private Integer page;
     private Integer page;
     private Integer limit;
     private Integer limit;

src/main/java/com/gxmailu/ocrCloudPlatform/service/impl/ElasticSearchService.java

@@ -355,7 +355,10 @@ public class ElasticSearchService {
                     }));
                     }));
 
 
                     if (ObjUtil.isNotNull(recordDto.getApplicationId())) {
                     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;
                     return boolQuery;
                 }))
                 }))

src/main/resources/application-dev.yml

@@ -71,7 +71,7 @@ elasticsearch:
   http: http
   http: http
   username: elastic
   username: elastic
   password: RQuT4eQIdIZ57waX9f87
   password: RQuT4eQIdIZ57waX9f87
-#
+
 #eureka:
 #eureka:
 #  client:
 #  client:
 #    enabled: false
 #    enabled: false
\ No newline at end of file