fixed essearch

src/main/java/com/example/xiaoshiweixinback/entity/dto/esPicture/EsPatentVectorDTO.java

@@ -16,7 +16,7 @@ public class EsPatentVectorDTO {
     private String appCountry;
 
     //权利人
-    private String name;
+    private String companyName;
 
     private String description;
 

src/main/java/com/example/xiaoshiweixinback/entity/dto/patent/SelectPatentDTO.java

@@ -29,5 +29,5 @@ public class SelectPatentDTO {
     private String appCountry;
 
     //权利人
-    private String name;
+    private String companyName;
 }

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsDenseVectorService.java

@@ -83,7 +83,7 @@ public class EsDenseVectorService {
         //设置查询索引
         builder.index("patent_vector");
         Query q = null;
-        String condition = this.appendCondition(dto.getProductId(), dto.getKey(),dto.getAppCountry(),dto.getName());
+        String condition = this.appendCondition(dto.getProductId(), dto.getKey(),dto.getAppCountry(),dto.getCompanyName());
         if (StringUtils.isNotEmpty(condition)) {
             //1. 解析检索条件
             treeNode tree = expressManager.getInstance().Parse(condition, false);
@@ -220,7 +220,7 @@ public class EsDenseVectorService {
      * @return
      * @throws Exception
      */
-    public String appendCondition(Integer productId, String keyword,String appCountry,String name) {
+    public String appendCondition(Integer productId, String keyword,String appCountry,String companyName) {
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         SimpleDateFormat format1 = new SimpleDateFormat("yyyy");
 
@@ -248,11 +248,11 @@ public class EsDenseVectorService {
                 searchCondition = searchCondition + " AND " + "CO = " + "(" + appCountry + ")";
             }
         }
-        if (StringUtils.isNotEmpty(name)) {
+        if (StringUtils.isNotEmpty(companyName)) {
             if (StringUtils.isEmpty(searchCondition)) {
-                searchCondition = "PE = " + "(" + name + ")";
+                searchCondition = "PE = " + "(" + companyName + ")";
             } else {
-                searchCondition = searchCondition + " AND " + "PE = " + "(" + "\"" + name + "\"" + ")";
+                searchCondition = searchCondition + " AND " + "PE = " + "(" + "\"" + companyName + "\"" + ")";
             }
         }
         if (StringUtils.isNotEmpty(searchCondition)) {

src/main/java/com/example/xiaoshiweixinback/service/importPatent/EsPatentService.java

@@ -362,7 +362,7 @@ public class EsPatentService {
         //设置查询索引
         builder.index("patent_vector");
         Query q = null;
-        String condition = esDenseVectorService.appendCondition(patentDTO.getProductId(), patentDTO.getKey(), patentDTO.getAppCountry(), patentDTO.getName());
+        String condition = esDenseVectorService.appendCondition(patentDTO.getProductId(), patentDTO.getKey(), patentDTO.getAppCountry(), patentDTO.getCompanyName());
         if (StringUtils.isNotEmpty(condition)) {
             //1. 解析检索条件
             treeNode tree = expressManager.getInstance().Parse(condition, false);