|
@@ -10,6 +10,7 @@ import cn.cslg.pas.common.model.vo.outApi.StarPatentVO;
|
|
import cn.cslg.pas.common.utils.FormatUtil;
|
|
import cn.cslg.pas.common.utils.FormatUtil;
|
|
import cn.cslg.pas.common.utils.JsonUtils;
|
|
import cn.cslg.pas.common.utils.JsonUtils;
|
|
import cn.cslg.pas.common.utils.SecurityUtils.SecurityUtils;
|
|
import cn.cslg.pas.common.utils.SecurityUtils.SecurityUtils;
|
|
|
|
+import cn.cslg.pas.domain.PatentApplicant;
|
|
import cn.cslg.pas.domain.PubNo;
|
|
import cn.cslg.pas.domain.PubNo;
|
|
import cn.hutool.crypto.SecureUtil;
|
|
import cn.hutool.crypto.SecureUtil;
|
|
import com.alibaba.fastjson.JSON;
|
|
import com.alibaba.fastjson.JSON;
|
|
@@ -122,12 +123,27 @@ public class PatentStarApiService {
|
|
JSONObject jsonObject = JSONObject.parseObject(Objects.requireNonNull(response.body()).string());
|
|
JSONObject jsonObject = JSONObject.parseObject(Objects.requireNonNull(response.body()).string());
|
|
JSONObject Data = (JSONObject) jsonObject.get("Data");
|
|
JSONObject Data = (JSONObject) jsonObject.get("Data");
|
|
List<StarPatentVO> starPatentVOS = JSONArray.parseArray(Data.get("List").toString(), StarPatentVO.class);
|
|
List<StarPatentVO> starPatentVOS = JSONArray.parseArray(Data.get("List").toString(), StarPatentVO.class);
|
|
|
|
+ starPatentVOS.forEach(item->{
|
|
|
|
+ item.setApplicant(new ArrayList<>());
|
|
|
|
+ item.setInventor(Arrays.asList(item.getInventorStr().split(";")));
|
|
|
|
+ item.setIpcList(Arrays.asList(item.getIpcListStr().split(";")));
|
|
|
|
+ List<String> applicants = Arrays.asList( item.getApplicantStr().split(";"));
|
|
|
|
+ applicants.forEach(
|
|
|
|
+ tem->{
|
|
|
|
+ PatentApplicant patentApplicant =new PatentApplicant();
|
|
|
|
+ patentApplicant.setType(2);
|
|
|
|
+ patentApplicant.setDataType(2);
|
|
|
|
+ patentApplicant.setName(tem);
|
|
|
|
+ item.getApplicant().add(patentApplicant);
|
|
|
|
+ }
|
|
|
|
+ );
|
|
|
|
+ });
|
|
// 打印服务端返回结果
|
|
// 打印服务端返回结果
|
|
// return Objects.requireNonNull(response.body()).string();
|
|
// return Objects.requireNonNull(response.body()).string();
|
|
Map<String, Object> reMap = new HashMap<>();
|
|
Map<String, Object> reMap = new HashMap<>();
|
|
reMap.put("size", patentStarListDto.getRowCount());
|
|
reMap.put("size", patentStarListDto.getRowCount());
|
|
reMap.put("current", patentStarListDto.getPageNum());
|
|
reMap.put("current", patentStarListDto.getPageNum());
|
|
- reMap.put("records", starPatentVOS);
|
|
|
|
|
|
+ reMap.put("records",starPatentVOS);
|
|
reMap.put("total", Data.get("HitCount"));
|
|
reMap.put("total", Data.get("HitCount"));
|
|
return reMap;
|
|
return reMap;
|
|
}
|
|
}
|