修改根据uid和姓名查询百度采集信息

src/main/java/com/zzsn/leaderbase/controller/CharacterDetailsController.java

@@ -173,8 +173,8 @@ public class CharacterDetailsController {
      */
     @GetMapping("/getCharacterBaike")
     public Result<?> getCharacterBaike(
-            @RequestParam(name="uid",required=true) String uid,
-            @RequestParam(name="name",required=true) String name
+            @RequestParam(name="uid",required=false) String uid,
+            @RequestParam(name="name",required=false) String name
     ) {
         log.info("根据uid和人物名称从es库中查询从百度采集的人物信息:{}---{}", uid, name);
         return esServer.getCharacterBaike(uid, name);

src/main/java/com/zzsn/leaderbase/entity/SysBaseDomesticRegion.java

@@ -9,12 +9,19 @@ import lombok.EqualsAndHashCode;
 @TableName("sys_base_domestic_region")
 public class SysBaseDomesticRegion {
 
+  //主键id
   private String id;
+  //名称
   private String name;
+  //编码
   private String code;
+  //节点id绝对路径
   private String pathIds;
+  //层级
   private Long level;
+  //父id
   private String pid;
+  //是否有子节点
   private String hasChild;
 
 }

src/main/java/com/zzsn/leaderbase/service/EsServer.java

@@ -46,9 +46,14 @@ public class EsServer {
     }
 
     public Result<?> getCharacterBaike(String uid, String name){
+
+        //参数校验
+        if(uid == null || uid.length() == 0 || name == null || name.length() == 0)
+            return Result.OK("未查询到人物详情信息", null);
+
         UserServerCharacterVo vo = esUtil.getCharacterBaike(USERSERVER_CHARACTER, uid, name, UserServerCharacterVo.class);
         if(vo == null)
-            return Result.OK("该人物没有详情信息", null);
+            return Result.OK("未查询到人物详情信息", null);
         return Result.OK(vo);
     }
 

src/main/java/com/zzsn/leaderbase/util/EsUtil.java

@@ -721,16 +721,11 @@ public class EsUtil {
             searchSourceBuilder.size(1);
             searchSourceBuilder.sort("createDate", SortOrder.DESC);
 
-            String u = "uid";
-            String n = "name";
-            QueryBuilder qb1 = QueryBuilders.termQuery("uid.keyword", uid);
-            QueryBuilder qb2 = QueryBuilders.termQuery("name.keyword", uid);
-            QueryBuilder qb3 = QueryBuilders.boolQuery().must(qb1).must(qb2);
+            BoolQueryBuilder boolQuery = QueryBuilders.boolQuery()
+                    .must(QueryBuilders.matchQuery("uid",uid))
+                    .must(QueryBuilders.matchQuery("name",name));
 
-
-            TermQueryBuilder termUid = QueryBuilders.termQuery(u, uid);
-            TermQueryBuilder termName = QueryBuilders.termQuery(n, name);
-            searchSourceBuilder.query(qb3);
+            searchSourceBuilder.query(boolQuery);
             searchRequest.source(searchSourceBuilder);
             SearchResponse searchResponse = client.search(searchRequest, RequestOptions.DEFAULT);
             SearchHit[] hits = searchResponse.getHits().getHits();