fixed

src/main/java/cn/cslg/pas/service/business/FeatureService.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.service.business;
 
 import cn.cslg.pas.common.TreeBuild;
+import cn.cslg.pas.common.dto.PatentColumnDTO;
 import cn.cslg.pas.common.dto.QueryPatentClaimDTO;
 import cn.cslg.pas.common.dto.QuerySplitDTO;
 import cn.cslg.pas.common.dto.business.SelectClaimDTO;
@@ -16,6 +17,7 @@ import cn.cslg.pas.common.vo.business.SplitVO;
 import cn.cslg.pas.common.vo.invalidVO.QueryClaimSplitHistoryVO;
 import cn.cslg.pas.domain.business.*;
 import cn.cslg.pas.domain.es.PatentTranslate;
+import cn.cslg.pas.domain.es.Text;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.mapper.FeatureMapper;
 import cn.cslg.pas.service.ClaimMessageService;
@@ -288,19 +290,19 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
 
             List<PatentRightTree> treeNodeList = new ArrayList<>();
             //装载权要原文
-            PatentRightParams params = new PatentRightParams();
-            params.setPatentNo(patentNo);
-            params.setContent("");
+//            PatentRightParams params = new PatentRightParams();
+//            params.setPatentNo(patentNo);
+//            params.setContent("");
 
 
             //判断若处理后的权要集合只有1个元素并且类型type=-1、排序号sort=-1，则表示本次拆分失败，则直接返回整个权要
-            if (patentRights.size() == 1 && patentRights.get(0).getType() == -1 && patentRights.get(0).getSort() == -1) {
+            if (patentRights.size() == 1 && (patentRights.get(0).getType() == null || patentRights.get(0).getType() == -1) && patentRights.get(0).getSort() == -1) {
                 List<String> list = translateService.getTranslateOrder(patentNo, patentRights.get(0).getSort());
                 String translateContent = "";
                 if (!CollectionUtils.isEmpty(list)) {
                     translateContent = list.get(0);
                 }
-                treeNodeList.add(new PatentRightTree(patentRights.get(0).getSort(), null, patentRights.get(0).getContent(),translateContent));
+                treeNodeList.add(new PatentRightTree(patentRights.get(0).getSort(), null, patentRights.get(0).getContent(), translateContent));
                 return treeNodeList;
             }
             List<PatentRightContent> patentRightContents = this.loadPatentRightContent(patentRights);
@@ -566,7 +568,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
         if (patentSplitMessage == null) {
             throw new XiaoShiException("未进行拆分过");
         }
-        List<Integer> ids = this.saveFeatures(features, patentSplitMessage.getId(), projectId,signPatentNo);
+        List<Integer> ids = this.saveFeatures(features, patentSplitMessage.getId(), projectId, signPatentNo);
         return ids;
     }
 
@@ -579,7 +581,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
      * @param projectId
      * @return
      */
-    public List<Integer> saveFeatures(List<UpdateFeatureDTO.ChangedFeatures> features, Integer splitMessageId, Integer projectId,String patentNo) {
+    public List<Integer> saveFeatures(List<UpdateFeatureDTO.ChangedFeatures> features, Integer splitMessageId, Integer projectId, String patentNo) {
         List<Integer> addIds = new ArrayList<>();
         LambdaQueryWrapper<Feature> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.select(Feature::getId);
@@ -592,32 +594,32 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
         personnelVO.setTenantId(1);
 
         List<Feature> addFeatures = new ArrayList<>();
-        Integer order=1;
-        for(UpdateFeatureDTO.ChangedFeatures item:features) {
-                Integer id = item.getId();
-                if (id == null || !ids.contains(id)) {
-                    Feature feature = new Feature();
-                    feature.setCreateId(personnelVO.getId());
-                    feature.setSplitMessageId(splitMessageId);
-                    feature.setContent(item.getContent());
-                    feature.setExplainText(item.getExplainText());
-                    feature.setRightSort(item.getRightSort());
-                    feature.setProjectId(projectId);
-                    feature.setSysOrder(order);
-                    feature.setPatentNo(patentNo);
-                    feature.setRightType(item.getRightType());
-                    feature.setTenantId(personnelVO.getTenantId());
-                   feature.insert();
-                } else {
-                    ids.remove(id);
-                        Feature feature = this.getById(id);
-                        feature.setSysOrder(order);
-                        feature.setContent(item.getContent());
-                        feature.setExplainText(item.getExplainText());
-                        feature.updateById();
+        Integer order = 1;
+        for (UpdateFeatureDTO.ChangedFeatures item : features) {
+            Integer id = item.getId();
+            if (id == null || !ids.contains(id)) {
+                Feature feature = new Feature();
+                feature.setCreateId(personnelVO.getId());
+                feature.setSplitMessageId(splitMessageId);
+                feature.setContent(item.getContent());
+                feature.setExplainText(item.getExplainText());
+                feature.setRightSort(item.getRightSort());
+                feature.setProjectId(projectId);
+                feature.setSysOrder(order);
+                feature.setPatentNo(patentNo);
+                feature.setRightType(item.getRightType());
+                feature.setTenantId(personnelVO.getTenantId());
+                feature.insert();
+            } else {
+                ids.remove(id);
+                Feature feature = this.getById(id);
+                feature.setSysOrder(order);
+                feature.setContent(item.getContent());
+                feature.setExplainText(item.getExplainText());
+                feature.updateById();
 
-                }
-                order++;
+            }
+            order++;
         }
 
         //添加特征
@@ -645,9 +647,9 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
                 Integer claimMessageId = claimMessage.getId();
                 LambdaQueryWrapper<PatentClaim> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(PatentClaim::getClaimMessageId, claimMessageId);
-                List<PatentClaim> patentClaimList =patentClaimService.list(queryWrapper);
-                for (PatentClaim item: patentClaimList){
-                    RePatentClaim rePatentClaim =this.domainToRe(item);
+                List<PatentClaim> patentClaimList = patentClaimService.list(queryWrapper);
+                for (PatentClaim item : patentClaimList) {
+                    RePatentClaim rePatentClaim = this.domainToRe(item);
                     patentRights.add(rePatentClaim);
                 }
             }
@@ -657,13 +659,13 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Feature> {
         }
     }
 
-     private  RePatentClaim  domainToRe(PatentClaim patentClaim){
-         RePatentClaim rePatentClaim =new RePatentClaim();
-         rePatentClaim.setContent(patentClaim.getContent());
-         rePatentClaim.setId(patentClaim.getId());
-         rePatentClaim.setSort(patentClaim.getSysOrder());
-         rePatentClaim.setParentSort(patentClaim.getParentOrder());
-         rePatentClaim.setType(patentClaim.getClaimType());
-         return  rePatentClaim;
-     }
+    private RePatentClaim domainToRe(PatentClaim patentClaim) {
+        RePatentClaim rePatentClaim = new RePatentClaim();
+        rePatentClaim.setContent(patentClaim.getContent());
+        rePatentClaim.setId(patentClaim.getId());
+        rePatentClaim.setSort(patentClaim.getSysOrder());
+        rePatentClaim.setParentSort(patentClaim.getParentOrder());
+        rePatentClaim.setType(patentClaim.getClaimType());
+        return rePatentClaim;
+    }
 }

src/main/java/cn/cslg/pas/service/common/TranslateService.java

@@ -25,6 +25,7 @@ import co.elastic.clients.elasticsearch.core.SearchResponse;
 import co.elastic.clients.elasticsearch.core.UpdateByQueryRequest;
 import co.elastic.clients.elasticsearch.core.search.Hit;
 import com.aliyun.alimt20181012.models.TranslateGeneralResponse;
+import com.aliyun.alimt20181012.models.TranslateGeneralResponseBody;
 import com.aliyun.tea.TeaException;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.ObjectUtils;
@@ -415,7 +416,11 @@ public class TranslateService {
             int i = 0;
             for (EsTranslateDTO translateDTO : translateDTOS) {
                 Content content = translateDTO.getContent();
-                String translateContent = this.getTranslateContent(content.getTextContent());
+                String textContent = content.getTextContent();
+                if (textContent.contains("\r\n")) {
+                    textContent = textContent.replaceAll("\r\n", "");
+                }
+                String translateContent = this.getTranslateContent(textContent);
                 String s = this.loadingTranslate(translateDTO.getPatentNo(), translateDTO.getPatentField(), "CN", false,
                         content.getOrder(), content.getParentSort(), translateContent);
                 if (StringUtils.isNotEmpty(s)) {