zero 1 年間 前
コミット
67c9f095a8

+ 5 - 4
src/main/java/cn/cslg/pas/common/vo/StarPatentVO.java

@@ -24,10 +24,6 @@ public class StarPatentVO implements Serializable {
     @JSONField(name = "PT")
     private Integer patentType;
     /**
-     * 专利类型
-     */
-    private String type;
-    /**
      * 申请人地址
      */
     @JSONField(name = "DZ")
@@ -142,11 +138,16 @@ public class StarPatentVO implements Serializable {
      */
     @JSONField(name = "CO")
     private String provinceStr;
+
     private List<PatentInventor> inventor;
+
     private List<String> ipcList;
+
     private List<PatentApplicant> applicant;
 //    private PatentAgency agency;
+
     private List<PatentAgent> agent;
+
     private String simpleStatus;
     /**
      * 摘要附图路径

+ 21 - 1
src/main/java/cn/cslg/pas/service/common/PatentStarApiService.java

@@ -13,7 +13,10 @@ import cn.cslg.pas.common.vo.ContentVO;
 import cn.cslg.pas.common.vo.StarPatentVO;
 import cn.cslg.pas.domain.WebLoginConfig;
 import cn.cslg.pas.domain.business.RetrieveRecord;
+import cn.cslg.pas.domain.es.PatentClassify;
 import cn.cslg.pas.domain.es.PatentPerson;
+import cn.cslg.pas.domain.es.PersonAddress;
+import cn.cslg.pas.domain.es.Text;
 import cn.cslg.pas.service.WebLoginConfigService;
 
 import cn.cslg.pas.service.query.FormatQueryService;
@@ -99,6 +102,7 @@ public class PatentStarApiService {
         records.setCurrent(Long.parseLong(map.get("current").toString()));
         records.setSize(Long.parseLong(map.get("size").toString()));
         records.setData(this.loadPatent(starPatentVOS));
+//        records.setData(this.loadPatent(starPatentVOS));
         records.setTotal(Long.parseLong(map.get("total").toString()));
         return records;
     }
@@ -758,6 +762,14 @@ public class PatentStarApiService {
             patentColumnDTO.setPublicNo(item.getPublicNo());
             //装载公告号
             patentColumnDTO.setGrantNo(item.getPublicAccreditNo());
+            //装载专利状态
+            patentColumnDTO.setSimpleStatus(item.getLG().toString());
+            //装载摘要
+            List<Text> abstractList = new ArrayList<>();
+            Text text = new Text();
+            text.setTextContent(item.getAbstractStr());
+            abstractList.add(text);
+            patentColumnDTO.setAbstractStr(abstractList);
             //装载专利号
             if (patentColumnDTO.getAppNo() != null) {
                 if (patentColumnDTO.getAppNo().trim().startsWith("CN")) {
@@ -778,7 +790,15 @@ public class PatentStarApiService {
             if (item.getApplicationDate() != null && !item.getApplicationDate().trim().equals("")) {
                 patentColumnDTO.setAppDate(DateUtils.strToDate(item.getApplicationDate()));
             }
-
+            //装载申请人地址
+            PersonAddress appAddress = new PersonAddress();
+            appAddress.setAddress(item.getApplicationAddress());
+            appAddress.setProvince(item.getProvinceStr());
+            patentColumnDTO.setApplicantAddr(appAddress);
+            //装载ipc分类号
+            PatentClassify ipcClassify = new PatentClassify();
+            ipcClassify.setLevel5(item.getMainIpc());
+            patentColumnDTO.setMipc(ipcClassify);
             //装载公开日
             if (item.getPublicDate() != null && !item.getPublicDate().trim().equals("")) {
                 patentColumnDTO.setPublicDate(DateUtils.strToDate(item.getPublicDate()));