chenyi 1 سال پیش
والد
کامیت
84e26ef7f6

+ 8 - 8
src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/ParentQueryBuilder.java

@@ -20,41 +20,41 @@ public class ParentQueryBuilder implements IQueryBuilder{
 
     @Override
     public String getField() {
-        return null;
+        return field;
     }
 
     @Override
     public void setField(String field) {
-
+        this.field = field;
     }
 
     @Override
     public String getValue() {
-        return null;
+        return value;
     }
 
     @Override
     public void setValue(String value) {
-
+        this.value = value;
     }
 
     @Override
     public String getOperator() {
-        return null;
+        return operator;
     }
 
     @Override
     public void setOperator(String operator) {
-
+        this.operator = operator;
     }
 
     @Override
     public String getPath() {
-        return null;
+        return path;
     }
 
     @Override
     public void setPath(String path) {
-
+        this.path = path;
     }
 }

+ 8 - 8
src/main/java/cn/cslg/pas/factorys/EsBuilderFactory/ProjectQueryBuilder.java

@@ -20,41 +20,41 @@ public class ProjectQueryBuilder implements IQueryBuilder{
 
     @Override
     public String getField() {
-        return null;
+        return field;
     }
 
     @Override
     public void setField(String field) {
-
+        this.field = field;
     }
 
     @Override
     public String getValue() {
-        return null;
+        return value;
     }
 
     @Override
     public void setValue(String value) {
-
+        this.value = value;
     }
 
     @Override
     public String getOperator() {
-        return null;
+        return operator;
     }
 
     @Override
     public void setOperator(String operator) {
-
+        this.operator = operator;
     }
 
     @Override
     public String getPath() {
-        return null;
+        return path;
     }
 
     @Override
     public void setPath(String path) {
-
+        this.path = path;
     }
 }

+ 17 - 1
src/main/java/cn/cslg/pas/service/business/es/EsService.java

@@ -176,7 +176,6 @@ public class EsService {
      * @param page
      * @param limit
      * @return
-     * @throws IOException
      */
     public List<Patent> search(String key, Integer page, Integer limit) throws IOException {
         SearchRequest.Builder builder = new SearchRequest.Builder();
@@ -263,6 +262,23 @@ public class EsService {
 
         return list;
     }
+
+    /**
+     * 查询是否存在专利
+     * @param parentId
+     * @param projectId
+     * @return
+     */
+    public Boolean search(String parentId, Integer projectId){
+        boolean flag = false;
+        Query q1 = QueryBuilders.term(t -> t.field("project_id").value(projectId));
+        Query q2 = QueryBuilders.parentId(parent -> parent.type("project").id(parentId));
+        Query bool = QueryBuilders.bool(i -> i.must(q1, q2));
+        if (bool != null) {
+            flag = true;
+        }
+        return flag;
+    }
 }
 
 

+ 0 - 7
src/test/java/cn/cslg/pas/service/EsServiceTests.java

@@ -65,13 +65,6 @@ public class EsServiceTests {
     }
 
     @Test
-    public  void addImportTask() throws  Exception {
-        List<Patent> patentList = esService.search("1",1,10);
-        System.out.println(patentList);
-        Thread.sleep(1000000);
-    }
-
-    @Test
     void search() throws Exception {
         StringRequest stringRequest = new StringRequest();
         stringRequest.setSearchQuery("patentNo=CN201199922Y and (simpleFamilyNum>1 or simpleFamilyNum=0)");

+ 16 - 5
src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -1,11 +1,13 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.dto.PatentDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.*;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.controller.EventController;
 import cn.cslg.pas.controller.PatentController;
 import cn.cslg.pas.service.business.ProductMarketDataService;
+import cn.cslg.pas.service.business.es.EsService;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
 import org.junit.Before;
@@ -33,6 +35,8 @@ public class EventServiceTests {
     private EventController eventController;
     @Autowired
     PatentController patentController;
+    @Autowired
+    private EsService esService;
 
 
 
@@ -118,12 +122,19 @@ public class EventServiceTests {
 //        mapRequest.setSize(50L);
 //        mapRequest.setProjectId(1);
         StringRequest stringRequest = new StringRequest();
-        stringRequest.setSearchQuery("titleTextContent=电子");
-//        stringRequest.setSearchQuery("patentNo=CN201199922Y and (simpleFamilyNum>1 or simpleFamilyNum=0)");
+//        stringRequest.setSearchQuery("titleTextContent=电子");
+        stringRequest.setSearchQuery("patentNo=CN201199922Y and (simpleFamilyNum>1 or simpleFamilyNum=0)");
         stringRequest.setCurrent(0L);
         stringRequest.setSize(50L);
-        stringRequest.setProjectId(1);
-        Response response = patentController.queryPatent(stringRequest);
-        System.out.println(response);
+//        stringRequest.setProjectId(1);
+//
+        PatentDTO patentDTO = esService.esSearch(stringRequest);
+        System.out.println(patentDTO);
+    }
+
+    @Test
+    void test12(){
+        Boolean bool = esService.search("YST6D4wBmB3pRkTj49Jn", 5);
+        System.out.println(bool);
     }
 }