|
@@ -2,7 +2,6 @@ package cn.cslg.pas.service.upLoadPatent;
|
|
|
|
|
|
import cn.cslg.pas.common.model.dto.UploadFileDTO;
|
|
|
import cn.cslg.pas.common.model.outApi.PatentStarListDto;
|
|
|
-import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
|
|
|
import cn.cslg.pas.common.model.vo.UploadParamsVO;
|
|
|
import cn.cslg.pas.common.model.vo.outApi.StarPatentVO;
|
|
|
import cn.cslg.pas.common.utils.FileUtils;
|
|
@@ -81,7 +80,7 @@ public class ExcutePatentDataStar implements IExcutePatentData {
|
|
|
.setOrderByType("DESC")
|
|
|
.setPageNum(pageNum)
|
|
|
.setRowCount(size)
|
|
|
- .setDBType("cN");
|
|
|
+ .setDBType("CN");
|
|
|
//调用一般接口
|
|
|
Map<String, Object> resultMap = patentStarApiService.patentStarSearchApi(patentStarListDto);
|
|
|
if (resultMap == null || (Integer) resultMap.get("total") == 0) {
|
|
@@ -159,6 +158,10 @@ public class ExcutePatentDataStar implements IExcutePatentData {
|
|
|
Patent patent = new Patent();
|
|
|
//装载专利号
|
|
|
patent.setPatentNo(starPatent.getPatentNo());
|
|
|
+ //装载摘要
|
|
|
+ patent.setAbstractStr(starPatent.getAbstractStr());
|
|
|
+ //装载标题
|
|
|
+ patent.setName(starPatent.getName());
|
|
|
//装载申请号
|
|
|
patent.setApplicationNo(starPatent.getApplicationNo());
|
|
|
//装载申请日
|
|
@@ -174,10 +177,10 @@ public class ExcutePatentDataStar implements IExcutePatentData {
|
|
|
if (starPatent.getAbstractStr() != null && !starPatent.getAbstractStr().equals("")) {
|
|
|
uploadParamsVO.setPatentApplicantOriginalName(Arrays.asList(starPatent.getApplicantStr().split(";")));
|
|
|
}
|
|
|
- //装载摘要
|
|
|
- patent.setAbstractStr(starPatent.getAbstractStr());
|
|
|
- //装载标题
|
|
|
- patent.setName(starPatent.getName());
|
|
|
+ //装载权利人
|
|
|
+ if (starPatent.getCurrentApplicantStr() != null && !starPatent.getCurrentApplicantStr().equals("")) {
|
|
|
+ uploadParamsVO.setPatentApplicantCurrentName(Arrays.asList(starPatent.getCurrentApplicantStr().split(";")));
|
|
|
+ }
|
|
|
//装载IPC分类号
|
|
|
if (starPatent.getIpcListStr() != null && !starPatent.getIpcListStr().equals("")) {
|
|
|
String[] ipcArr = starPatent.getIpcListStr().split(";");
|
|
@@ -255,6 +258,7 @@ public class ExcutePatentDataStar implements IExcutePatentData {
|
|
|
List<ChinaLeagalStatus> chinaLeagalStatuses = JSON.parseArray(cnLegalApiStr, ChinaLeagalStatus.class);
|
|
|
ChinaLeagalStatus chinaLeagalStatus = chinaLeagalStatuses.get(0);
|
|
|
//装载法律状态
|
|
|
+ uploadParamsVO.setPatentSimpleStatus(chinaLeagalStatus.getLegalStatus());
|
|
|
uploadParamsVO.setSimpleStatus(chinaLeagalStatus.getLegalStatus());
|
|
|
|
|
|
|