es

src/main/java/cn/cslg/pas/common/dto/es/EsCustomFieldDTO.java

@@ -22,6 +22,7 @@ public class EsCustomFieldDTO {
 
     /**
      * 栏位类型
+     * 自定义栏位类型（0数字，1日期，2文本，4单选，5多选，6树，7产品8产品类别9技术分类）
      */
     Integer fieldType;
 

src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -1,12 +1,10 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.dto.PatentColumnDTO;
 import cn.cslg.pas.common.dto.PatentDetailDTO;
 import cn.cslg.pas.common.dto.PatentKinDTO;
 import cn.cslg.pas.common.dto.business.EsCountDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
-import cn.cslg.pas.common.model.request.MapRequest;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.vo.business.EsCountVO;
@@ -15,7 +13,7 @@ import cn.cslg.pas.common.vo.business.PatentNoVO;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
 import cn.cslg.pas.service.business.es.EsCountService;
-import cn.cslg.pas.service.business.es.PatentService;
+import cn.cslg.pas.service.business.es.EsPatentService;
 import io.swagger.v3.oas.annotations.Operation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -36,7 +34,7 @@ public class PatentController {
     private EsCountService esCountService;
 
     @Autowired
-    private PatentService patentService;
+    private EsPatentService patentService;
 
     @Operation(summary = "查询专利")
     @PostMapping("/queryPatent")

src/main/java/cn/cslg/pas/service/business/es/PatentService.java

@@ -27,7 +27,7 @@ import java.util.List;
 
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
-public class PatentService {
+public class EsPatentService {
 
     private final ElasticsearchClient client;
     /**

src/test/java/cn/cslg/pas/service/EventServiceTests.java

@@ -1,6 +1,5 @@
 package cn.cslg.pas.service;
 
-import cn.cslg.pas.common.dto.PatentColumnDTO;
 import cn.cslg.pas.common.dto.PatentDTO;
 import cn.cslg.pas.common.dto.PatentDetailDTO;
 import cn.cslg.pas.common.dto.PatentKinDTO;
@@ -8,6 +7,7 @@ import cn.cslg.pas.common.dto.business.EsCountDTO;
 import cn.cslg.pas.common.dto.business.EsPatentFamilyDTO;
 import cn.cslg.pas.common.dto.business.ReportTempleDTO;
 import cn.cslg.pas.common.dto.business.SelectClaimDTO;
+import cn.cslg.pas.common.dto.es.EsCustomFieldDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.*;
 import cn.cslg.pas.common.utils.Response;
@@ -22,15 +22,10 @@ import cn.cslg.pas.domain.es.PatentFamilyMessage;
 import cn.cslg.pas.service.business.ProductMarketDataService;
 import cn.cslg.pas.service.business.TempleService;
 import cn.cslg.pas.service.business.es.EsCountService;
+import cn.cslg.pas.service.business.es.EsCustomFieldService;
 import cn.cslg.pas.service.business.es.EsService;
-import cn.cslg.pas.service.business.es.PatentService;
-import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
-import co.elastic.clients.elasticsearch._types.aggregations.AggregationBuilders;
-import co.elastic.clients.elasticsearch._types.aggregations.CalendarInterval;
-import co.elastic.clients.elasticsearch._types.query_dsl.Query;
-import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
+import cn.cslg.pas.service.business.es.EsPatentService;
 import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.http.entity.ContentType;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,7 +56,9 @@ public class EventServiceTests {
     @Autowired
     private TempleService templeService;
     @Autowired
-    private PatentService patentService;
+    private EsPatentService patentService;
+    @Autowired
+    private EsCustomFieldService esCustomFieldService;
 
 
     @Autowired
@@ -275,4 +272,16 @@ public class EventServiceTests {
         List<ReportTempleDTO> reportTempleDTOS = templeService.queryTempleByType(vo);
         System.out.println(reportTempleDTOS);
     }
+
+    @Test
+    void test15() throws Exception {
+        EsCustomFieldDTO dto = new EsCustomFieldDTO();
+        dto.setProjectId(77);
+        dto.setFieldType(6);
+        dto.setFieldId("z147258369");
+        dto.setFieldValue(Arrays.asList("77"));
+        dto.setOptionType(1);
+        dto.setPatentNo("CN201910069334.7");
+        esCustomFieldService.addCustomField(dto);
+    }
 }