claim

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

@@ -761,14 +761,15 @@ public class EsService {
         long total = response.hits().total().value();
         for (Hit<Patent> hit : hits) {
             Patent esMess = hit.source();
-            dto.setClaim(JSON.toJSONString(esMess.getClaim()));
-//            if (esMess != null) {
-//                String claim = StringUtils.strip(JSON.toJSONString(esMess.getClaim()), "[]");
-//                ClaimDetailDTO claimDetailDTO = JSONObject.parseObject(claim, ClaimDetailDTO.class);
-//                if (claimDetailDTO.getIfOrigin()) {
-//                    dto.setClaim(claimDetailDTO.getTextContent());
-//                }
-//            }
+//            dto.setClaim(JSON.toJSONString(esMess.getClaim()));
+            //只返回具体内容
+            if (esMess != null) {
+                String claim = StringUtils.strip(JSON.toJSONString(esMess.getClaim()), "[]");
+                ClaimDetailDTO claimDetailDTO = JSONObject.parseObject(claim, ClaimDetailDTO.class);
+                if (Boolean.TRUE.equals(claimDetailDTO.getIfOrigin())) {
+                    dto.setClaim(claimDetailDTO.getTextContent());
+                }
+            }
         }
         return dto;
     }

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

@@ -9,14 +9,11 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.controller.EventController;
 import cn.cslg.pas.controller.PatentController;
 import cn.cslg.pas.domain.es.FamilyPatent;
-import cn.cslg.pas.domain.es.Patent;
 import cn.cslg.pas.domain.es.PatentFamilyMessage;
 import cn.cslg.pas.service.business.ProductMarketDataService;
 import cn.cslg.pas.service.business.es.EsService;
-import co.elastic.clients.elasticsearch.core.DeleteRequest;
 import com.alibaba.fastjson.JSONObject;
 import org.apache.http.entity.ContentType;
-import org.junit.Before;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;