소스 검색

专利检索导入

lwhhszx 1 년 전
부모
커밋
85e551ae9b

+ 2 - 0
pom.xml

@@ -32,6 +32,7 @@
         <elasticsearch.version>8.6.1</elasticsearch.version>
     </properties>
 
+
     <dependencies>
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -232,6 +233,7 @@
     </dependencies>
 
 
+
     <build>
         <finalName>PAS_PROD2.0</finalName>
         <plugins>

+ 19 - 1
src/main/java/cn/cslg/pas/common/utils/DateUtils.java

@@ -701,6 +701,24 @@ public class DateUtils {
 
         return calculate;
     }
-
+    /**
+     * 专利之星返回日期格式为字符串 yyyyMMdd,如 "20230713",本方法将其转成10位数字时间戳
+     *
+     * @param dateStr yyyyMMdd格式字符串日期
+     * @return 返回10位数字时间戳
+     */
+    public static int  stringDateToTimeStamp(String dateStr) {
+        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+        Date date;
+        try {
+            date = dateFormat.parse(dateStr);
+        } catch (ParseException e) {
+            //日期格式转换异常
+            e.printStackTrace();
+            return Integer.parseInt(dateStr);
+        }
+        long timeStamp = date.getTime() / 1000;
+        return (int) timeStamp;
+    }
 
 }

+ 55 - 0
src/main/java/cn/cslg/pas/common/utils/esDataForm/AddressSplitter.java

@@ -0,0 +1,55 @@
+package cn.cslg.pas.common.utils.esDataForm;
+
+import cn.cslg.pas.domain.es.PatentClassify;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AddressSplitter {
+    public static void main(String[] args) {
+        String address = "浙江省杭州市西湖区文一西路";
+       List<String> strings = splitAddress(address);
+       System.out.println(strings);
+    }
+
+    public static List<String> splitAddress(String address) {
+        List<String> addresses =new ArrayList<>();
+        // 定义省、市、区的正则表达式
+        String provinceRegex = "(?<=省|自治区|特别行政区).+?(?=(市|地区|州))";
+        String cityRegex = "(?<=市).+?(?=(区|县|市|自治州))";
+        String districtRegex = "(?<=(市|区|县|镇)).+?(?=(街道|乡|村))";
+
+        // 初始化省、市、区
+        String province = "";
+        String city = "";
+        String district = "";
+
+        // 匹配省份
+        String[] provinceArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(address, "省");
+        if (provinceArray.length > 1) {
+            province = provinceArray[0] + "省";
+            address = provinceArray[1];
+        }
+
+        // 匹配城市
+        String[] cityArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(address, "市");
+        if (cityArray.length > 1) {
+            city = cityArray[0] + "市";
+            address = cityArray[1];
+        }
+
+        // 匹配区县
+        String[] districtArray = StringUtils.splitByWholeSeparatorPreserveAllTokens(address, "区");
+        if (districtArray.length > 1) {
+            district = districtArray[0] + "区";
+        }
+
+        // 输出结果
+        addresses.add(province);
+        addresses.add(city);
+        addresses.add(district);
+       return addresses;
+
+    }
+}

+ 42 - 0
src/main/java/cn/cslg/pas/common/utils/esDataForm/PatentClassifySplitter.java

@@ -0,0 +1,42 @@
+package cn.cslg.pas.common.utils.esDataForm;
+
+import cn.cslg.pas.domain.es.PatentClassify;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PatentClassifySplitter {
+    public static void main(String[] args) {
+        String address = "G06V10/56";
+        PatentClassify strings = split(address);
+        System.out.println(strings);
+    }
+
+    public static PatentClassify split(String classify) {
+        PatentClassify patentClassify = new PatentClassify();
+        Integer length = classify.length();
+        String level1 = "";
+        String level2 = "";
+        String level3 = "";
+        String level4 = "";
+        String level5 = "";
+        level1 = classify.substring(0, 1);
+        patentClassify.setLevel1(level1);
+        level2 = classify.substring(0, 3);
+        patentClassify.setLevel2(level2);
+
+        if (length >= 4) {
+            level3 = classify.substring(0, 4);
+            patentClassify.setLevel3(level3);
+
+            if (length >= 8) {
+                level4 = classify.substring(0, classify.indexOf("/") + 1) + "00";
+                patentClassify.setLevel4(level4);
+                level5 = classify;
+                patentClassify.setLevel5(level5);
+            }
+        }
+        return patentClassify;
+    }
+}

+ 66 - 0
src/main/java/cn/cslg/pas/common/vo/business/ImportTaskVO.java

@@ -0,0 +1,66 @@
+package cn.cslg.pas.common.vo.business;
+
+import cn.cslg.pas.common.vo.ProgressVO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 实体类表以及栏位信息
+ */
+@Data
+public class ImportTaskVO {
+    /**
+     * 条件
+     */
+    private String condition;
+
+    /**
+     * 项目id
+     */
+
+    private Integer importToId;
+
+    /**
+     * 项目类型
+     * 0专题库 1报告 2产品
+     */
+    private Integer importToType;
+
+
+    /**
+     * 周期
+     */
+    private String crons;
+
+
+    /**
+     * 若是检索导入/专利号导入则必填
+     * 五位数字
+     * 第1著录项目2附图
+     * 3权利要求,4说明书文本,5pdf文档
+     */
+    private List<Integer> importContent;
+
+    /**
+     * 是否更新
+     */
+    private Integer ifUpdate;
+
+    private Integer type;
+
+    /**
+     * 文件guid
+     */
+    private String fileGuid;
+
+    /**
+     * 若是excel导入任务,则使用到配置文件source_id
+     */
+    private Integer excelSourceId;
+
+
+   private List<ProjectFieldVO> projectFieldVO;
+
+}

+ 14 - 0
src/main/java/cn/cslg/pas/common/vo/business/ProjectFieldVO.java

@@ -0,0 +1,14 @@
+package cn.cslg.pas.common.vo.business;
+
+import lombok.Data;
+
+
+/**
+ * 栏位标引
+ */
+@Data
+public class ProjectFieldVO {
+ private  Integer fieldType;
+ private  Integer fieldId;
+ private  Integer fieldValueId;
+}

+ 2 - 8
src/main/java/cn/cslg/pas/domain/business/ImportTaskCondition.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author xiexiang
@@ -17,32 +18,28 @@ public class ImportTaskCondition extends BaseEntity<ImportTaskCondition> {
     /**
      * 项目id
      */
-    @TableField(value = "project_id")
     private Integer projectId;
 
+    private List<String> patentNos;
     /**
      * 项目类型
      * 0专题库 1报告
      */
-    @TableField(value = "project_type")
     private Integer projectType;
 
     /**
      * 产品id
      */
-    @TableField(value = "product_id")
     private Integer productId;
 
     /**
      * 周期
      */
-    @TableField(value = "crons")
     private String crons;
 
     /**
      * 上次更新时间
      */
-    @TableField(value = "last_update_date")
     private Date lastUpdateDate;
 
     /**
@@ -51,19 +48,16 @@ public class ImportTaskCondition extends BaseEntity<ImportTaskCondition> {
      * 第1著录项目2附图
      * 3权利要求,4说明书文本,5pdf文档
      */
-    @TableField(value = "import_content")
     private Integer importContent;
 
     /**
      * 是否更新
      */
-    @TableField(value = "if_update")
     private Integer ifUpdate;
 
     /**
      * 条件
      */
-    @TableField(value = "'condition'")
     private String condition;
 
     /**

+ 4 - 4
src/main/java/cn/cslg/pas/domain/es/Patent.java

@@ -52,13 +52,13 @@ public class Patent {
      * 申请人地址
      */
     @JsonProperty("applicant_addr")
-    private List<PersonAddress> applicantAddr;
+    private PersonAddress applicantAddr;
 
     /**
-     * 申请人地址
+     * 权利人地址
      */
     @JsonProperty("right_holder_addr")
-    private List<PersonAddress> rightHolderAddr;
+    private PersonAddress rightHolderAddr;
     /**
      * 审查员
      */
@@ -111,7 +111,7 @@ public class Patent {
      * 授权日
      */
     @JsonProperty("grant_date")
-    private Integer grantDate;
+    private String grantDate;
 
     /**
      * 优先权

+ 94 - 4
src/main/java/cn/cslg/pas/service/importPatent/GetCataloguingFromWebThread.java

@@ -2,10 +2,12 @@ package cn.cslg.pas.service.importPatent;
 
 import cn.cslg.pas.common.dto.UploadPatentWebDTO;
 import cn.cslg.pas.common.model.cronModel.SystemFile;
+import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.ReadExcelUtils;
+import cn.cslg.pas.common.utils.esDataForm.AddressSplitter;
+import cn.cslg.pas.common.utils.esDataForm.PatentClassifySplitter;
 import cn.cslg.pas.common.vo.*;
-import cn.cslg.pas.domain.es.Patent;
-import cn.cslg.pas.domain.es.Text;
+import cn.cslg.pas.domain.es.*;
 import cn.cslg.pas.service.common.ExcuteDataToVOService;
 import cn.cslg.pas.service.common.ExcuteUploadSettingService;
 import cn.cslg.pas.service.common.FileManagerService;
@@ -38,10 +40,11 @@ public class GetCataloguingFromWebThread extends Thread {
     private List<UploadPatentWebDTO> uploadPatentWebDTOs;
     private final Lock taskLock = new ReentrantLock();
     private final Condition taskCondition = taskLock.newCondition();
+
     @Override
     public void run() {
         try {
-            while ( uploadPatentWebDTOs.size() > 0||importTaskAMVO.getProgressVO().equals(1)) {
+            while (uploadPatentWebDTOs.size() > 0 || importTaskAMVO.getProgressVO().equals(1)) {
 
                 //判断任务队列是否有任务,若没有则线程等待唤醒
                 if (uploadPatentWebDTOs.size() == 0) {
@@ -50,10 +53,12 @@ public class GetCataloguingFromWebThread extends Thread {
                 }
                 //根据专利申请号查询著录并装载信息
                 UploadPatentWebDTO uploadPatentWebDTO = uploadPatentWebDTOs.remove(0);
+
                 String chinaPatentZhuLuStr = patentStarApiService.getCnBibApi(uploadPatentWebDTO.getPatent().getAppNo());
                 if (chinaPatentZhuLuStr != null && !chinaPatentZhuLuStr.trim().equals("") && !chinaPatentZhuLuStr.equals("{}") && !chinaPatentZhuLuStr.contains("请求不合法")) {
                     List<ChinaPatentZhuLu> chinaPatentZhuLus = JSON.parseArray(chinaPatentZhuLuStr, ChinaPatentZhuLu.class);
                     ChinaPatentZhuLu chinaPatentZhuLu = chinaPatentZhuLus.get(0);
+                    this.loadPatent(uploadPatentWebDTO, chinaPatentZhuLu);
                     importFromWebToEsService.savePatentToEs(uploadPatentWebDTO);
                 }
             }
@@ -69,6 +74,7 @@ public class GetCataloguingFromWebThread extends Thread {
         this.importFromWebToEsService = importFromWebToEsService;
         this.applicationContext = taskThread.getApplicationContext();
     }
+
     public void awakeTask(UploadPatentWebDTO uploadPatentWebDTO) {
         uploadPatentWebDTOs.add(uploadPatentWebDTO);
         if (taskLock.tryLock()) {
@@ -78,7 +84,91 @@ public class GetCataloguingFromWebThread extends Thread {
     }
 
 
-    //装载权利要求
+    //装载专利信息
+    private void loadPatent(UploadPatentWebDTO uploadPatentWebDTO, ChinaPatentZhuLu chinaPatentZhuLu) {
+        Patent patent = uploadPatentWebDTO.getPatent();
+        StarPatentVO starPatentVO = uploadPatentWebDTO.getStarPatentVO();
+        //装载专利类型
+        Integer patentType = starPatentVO.getPatentType();
+        if (patentType != null) {
+            if (patentType.equals(2) || patentType.equals(9)) {
+                patent.setPatentType("1");  //实用新型
+            } else if (patentType.equals(1) || patentType.equals(8)) {
+                patent.setPatentType("2");  //发明
+            } else if (patentType.equals(3)) {
+                patent.setPatentType("3");  //外观设计
+            }
+        }
+
+        //装载申请人地址
+        if (starPatentVO.getApplicationAddress() != null && !starPatentVO.getApplicationAddress().equals("")) {
+            String applicationAddress = starPatentVO.getApplicationAddress();
+        List<String> addresses =    AddressSplitter.splitAddress(applicationAddress);
+            PersonAddress personAddress =new PersonAddress();
+            personAddress.setProvince(addresses.get(0));
+            personAddress.setCity(addresses.get(1));
+            personAddress.setDistrict(addresses.get(2));
+            patent.setApplicantAddr(personAddress);
+        }
+
+        //装载IPC分类号
+        if (starPatentVO.getIpcListStr() != null && !starPatentVO.getIpcListStr().equals("")) {
+            List<PatentClassify> patentClassifies =new ArrayList<>();
+            List<String> ipcArr =Arrays.asList(starPatentVO.getIpcListStr().split(";"));
+            for(int i=0;i<ipcArr.size();i++){
+                PatentClassify patentClassify = PatentClassifySplitter.split(ipcArr.get(i));
+                patentClassifies.add(patentClassify);
+               if(i==0){
+                   patent.setMipc(patentClassify);
+               }
+            }
+          patent.setIpc(patentClassifies);
+        }
+
+        //装载公告日
+        if (starPatentVO.getPublicAccreditDate() != null && !starPatentVO.getPublicAccreditDate().equals("")) {
+//
+//            patent.setGrantDate();
+        }
+
+        //装载摘要
+        if (starPatentVO.getAbstractStr() != null && !starPatentVO.getAbstractStr().equals("")) {
+            Text text =new Text();
+            text.setLanguage(patent.getAppCountry());
+            text.setIfOrigin(true);
+            text.setTextContent(starPatentVO.getAbstractStr());
+            patent.setAbstractStr(Arrays.asList(text));
+        }
+
+        //装载申请日
+        if (starPatentVO.getApplicationDate() != null && !starPatentVO.getApplicationDate().equals("")) {
+//            int timeStamp = stringDateToTimeStamp(starPatent.getApplicationDate());
+//            uploadParamsVO.getPatent().setApplicationDate(timeStamp);
+        }
+
+        //装载发明人
+        if (starPatentVO.getInventorStr() != null && !starPatentVO.getInventorStr().equals("")) {
+            List<String> patentInventorNames = Arrays.asList(starPatentVO.getInventorStr().split(";"));
+           List<PatentPerson> patentPeople =new ArrayList<>();
+            for (int i =0;i<patentInventorNames.size() ; i++) {
+                PatentPerson patentPerson =new PatentPerson();
+                patentPerson.setOrder(0);
+                patentPerson.setType("1");
+                patentPerson.setName(patentInventorNames.get(i));
+                patentPeople.add(patentPerson);
+            }
+            patent.setApplicant(patentPeople);
+        }
+    }
+
+    //装载中国专利
+ private void loadCNPatent(){
+
+ }
+
+ // 装载世界专利
+ private void loadWorldPatent(){
 
 
+ }
 }

+ 0 - 2
src/main/java/cn/cslg/pas/service/importPatent/GetPDFfromWebThread.java

@@ -27,14 +27,12 @@ public class GetPDFfromWebThread extends Thread {
     public void run() {
         try {
             while ( uploadPatentWebDTOs.size() > 0||importTaskAMVO.getProgressVO().equals(1)) {
-
                 //判断任务队列是否有任务,若没有则线程等待唤醒
                 if (uploadPatentWebDTOs.size() == 0) {
                     taskLock.lock();
                     taskCondition.await();
                 }
                 //根据专利申请号查询著录并装载信息
-
             }
 
         } catch (Exception e) {

+ 0 - 1
src/main/java/cn/cslg/pas/service/importPatent/GetPictureFromWebThread.java

@@ -40,7 +40,6 @@ public class GetPictureFromWebThread extends Thread {
         }
     }
 
-
     public GetPictureFromWebThread(TaskThread taskThread, ImportFromWebToEsService importFromWebToEsService) {
         this.importTaskAMVO = taskThread.getImportTaskAMVO();
         this.importFromWebToEsService = importFromWebToEsService;

+ 98 - 29
src/main/java/cn/cslg/pas/service/importPatent/GetRightAndFullTextFromWebThread.java

@@ -5,7 +5,9 @@ import cn.cslg.pas.common.dto.UploadPatentWebDTO;
 import cn.cslg.pas.common.model.importTaskModel.PatentRight;
 import cn.cslg.pas.common.vo.ChinaPatentZhuLu;
 import cn.cslg.pas.common.vo.ImportTaskAMVO;
+import cn.cslg.pas.common.vo.StarPatentVO;
 import cn.cslg.pas.domain.es.Patent;
+import cn.cslg.pas.domain.es.Text;
 import cn.cslg.pas.service.common.PatentStarApiService;
 import com.alibaba.fastjson.JSON;
 import org.dom4j.Document;
@@ -15,16 +17,18 @@ import org.dom4j.io.SAXReader;
 import org.springframework.beans.factory.annotation.Configurable;
 import org.springframework.context.ApplicationContext;
 
+import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 @Configurable
-public class GetRightAndFullTextFromWebThread extends Thread{
+public class GetRightAndFullTextFromWebThread extends Thread {
     private ImportTaskAMVO importTaskAMVO;
     private ApplicationContext applicationContext;
     private ImportFromWebToEsService importFromWebToEsService;
@@ -36,40 +40,18 @@ public class GetRightAndFullTextFromWebThread extends Thread{
     @Override
     public void run() {
         try {
-            while ( uploadPatentWebDTOs.size() > 0||importTaskAMVO.getProgressVO().equals(1)) {
+            while (uploadPatentWebDTOs.size() > 0 || importTaskAMVO.getProgressVO().equals(1)) {
                 UploadPatentWebDTO uploadPatentWebDTO = uploadPatentWebDTOs.remove(0);
-                Patent patent  =uploadPatentWebDTO.getPatent();
+                Patent patent = uploadPatentWebDTO.getPatent();
+                StarPatentVO starPatentVO =uploadPatentWebDTO.getStarPatentVO();
                 if (uploadPatentWebDTOs.size() == 0) {
                     taskLock.lock();
                     taskCondition.await();
                 }
                 if ((patent.getPublicNo() != null && patent.getPublicNo().contains("CN")) || (patent.getPublicNo() == null && patent.getPatentNo().contains("CN"))) {
-                    //根据申请号调用"获得中国专利全文文本"接口,获得包含各种xml标签的专利全文内容的长字符串 cnFullXmlStr
-                    String cnFullXmlStr = patentStarApiService.getCnFullXmlApi(patent.getAppNo());
-
-
-                    SAXReader reader = new SAXReader();
-                    reader.setEntityResolver(new IgnoreDTDEntityResolver());
-                    Reader stringReader = new StringReader(cnFullXmlStr);
-                    Document document = reader.read(stringReader);
-                    XPath xpath = document.createXPath("//claim-text");
-                    List<Element> element = (List<Element>) xpath.selectNodes(document);
-                    if (element.size() == 0) {
-                        xpath = document.createXPath("//business:ClaimText");
-                        element = (List<Element>) xpath.selectNodes(document);
-                    }
-                    List<String> reStrs = new ArrayList<>();
-                    element.forEach(item -> {
-                        String claim = item.getText();
-                        reStrs.add(claim);
-                    });
-                    String reStr = "";
-                    if (reStrs.size() != 0) {
-                        reStr = cn.cslg.pas.common.utils.StringUtils.join(reStrs, "\r\n");
-                    }
-                    //装载权利要求原文
-                    PatentRight patentRight = new PatentRight();
-
+                    String cnFullXmlStr = patentStarApiService.getCnFullXmlApi(starPatentVO.getRowApplicationNo());
+                       this.loadClaim(uploadPatentWebDTO,cnFullXmlStr);
+                       this.loadFullText(uploadPatentWebDTO,cnFullXmlStr);
                 }
             }
 
@@ -84,6 +66,7 @@ public class GetRightAndFullTextFromWebThread extends Thread{
         this.importFromWebToEsService = importFromWebToEsService;
         this.applicationContext = taskThread.getApplicationContext();
     }
+
     public void awakeTask(UploadPatentWebDTO uploadPatentWebDTO) {
         uploadPatentWebDTOs.add(uploadPatentWebDTO);
         if (taskLock.tryLock()) {
@@ -94,4 +77,90 @@ public class GetRightAndFullTextFromWebThread extends Thread{
 
 
     //装载权利要求
+    private void loadClaim(UploadPatentWebDTO uploadPatentWebDTO,String cnFullXmlStr) {
+        Patent patent = uploadPatentWebDTO.getPatent();
+        try {
+            if(cnFullXmlStr!=null&&cnFullXmlStr!="") {
+                SAXReader reader = new SAXReader();
+                reader.setEntityResolver(new IgnoreDTDEntityResolver());
+                Reader stringReader = new StringReader(cnFullXmlStr);
+                Document document = reader.read(stringReader);
+                XPath xpath = document.createXPath("//claim-text");
+                List<Element> element = (List<Element>) xpath.selectNodes(document);
+                if (element.size() == 0) {
+                    xpath = document.createXPath("//business:ClaimText");
+                    element = (List<Element>) xpath.selectNodes(document);
+                }
+                List<String> reClaims = new ArrayList<>();
+                element.forEach(item -> {
+                    String claim = item.getText();
+                    reClaims.add(claim);
+                });
+                String reClaim = "";
+                if (reClaims.size() != 0) {
+                    reClaim = cn.cslg.pas.common.utils.StringUtils.join(reClaims, "\r\n");
+                }
+                //装载权利要求原文
+                Text text = new Text();
+                text.setLanguage(patent.getAppCountry());
+                text.setTextContent(reClaim);
+                text.setIfOrigin(true);
+                patent.setClaim(Arrays.asList(text));
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+    }
+
+     //装载说明书文档
+    private void loadFullText(UploadPatentWebDTO uploadPatentWebDTO,String cnFullXmlStr) {
+        Patent patent = uploadPatentWebDTO.getPatent();
+        try {
+            //若没有取到全文文本,即取不到说明书文本,则将当前申请号或专利号和备注信息记录到问题记录表
+            if (cnFullXmlStr.equals("")) {
+                return ;
+            }
+
+            SAXReader reader = new SAXReader();
+            reader.setEntityResolver(new IgnoreDTDEntityResolver());
+            Reader stringReader = new StringReader(cnFullXmlStr);
+            Document document = reader.read(stringReader);
+            XPath xpath = document.createXPath("//description//p");
+            List<Element> elements = (List<Element>) xpath.selectNodes(document);
+            if (elements.size() == 0) {
+                xpath = document.createXPath("//business:Description//base:Paragraphs");
+                elements = (List<Element>) xpath.selectNodes(document);
+            }
+            List<String> fullTexts = new ArrayList<>();
+            Integer count=1;
+            for (Element item:elements){
+                String fullText = item.getText().replaceAll("<br/>", "");
+                if (!fullText.trim().equals("技术领域")
+                        && !fullText.trim().equals("发明内容")
+                        && !fullText.trim().equals("附图说明")
+                        && !fullText.trim().equals("具体实施方式")
+                        &&!fullText.trim().equals("背景技术"))
+                {String formattedNum = String.format("%04d", count);
+                    fullText ="["+formattedNum+"]"+fullText;
+                    count++;
+                }
+                fullTexts.add(fullText);
+            }
+            String fullText = "";
+            if (fullTexts.size() != 0) {
+                fullText = cn.cslg.pas.common.utils.StringUtils.join(fullTexts, "\r\n");
+            }
+            Text text =new Text();
+            text.setIfOrigin(true);
+            text.setTextContent(fullText);
+            text.setLanguage(patent.getAppCountry());
+            patent.setPublicFullText(Arrays.asList(text));
+    } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+    }
 }

+ 0 - 1
src/main/java/cn/cslg/pas/service/importPatent/SavePatentToEsThread.java

@@ -93,7 +93,6 @@ public class SavePatentToEsThread extends Thread {
         this.importTaskAMVO =taskThread.getImportTaskAMVO();
     }
 
-
     public void awakeTask(Patent patent) {
         patents.add(patent);
         if (taskLock.tryLock()) {