Commit b8380795 authored by chuwanshun's avatar chuwanshun

更新乱码

parent f1fbbf65
......@@ -77,10 +77,10 @@ public class RSAEncryptUtil {
}*/
Map map = new HashMap();
// map.put("id", "CN200930231881.8");
map.put("authorName", "李靖");
map.put("affilorg", "China Agricultural University");
map.put("current", "1");
map.put("id", "CN86105552");
// map.put("authorName", "李靖");
// map.put("affilorg", "China Agricultural University");
// map.put("current", "1");
test1(map);
}
......@@ -108,8 +108,11 @@ public class RSAEncryptUtil {
System.out.println("加密后字符串:"+content);
content = "QAJUA6NaIixzy3o4ujECzlh7LYLVEtnzdjdO16nWmRX6e5tfur9Elw8LWO0K5xBZwYEmekV2iHDVsXRiA2AhQ2oMB8LPcbyMpmDri18IO+fPiLikMYeJLL+9Gu0RYw30GyPndMy1xEZLUei7d3wqhkonEYYJKKYkSLOKuzFrTHdmYbEOe8FcS4F+Qum6aeg8ruaGixCQo6zRA4jz6DHEb3FRVhqJGVoIeYZ3UzeeBusvrV8IefFb/fIY7B0+HgrN62brdIaWo9SglCeeCiJpSub4JxWPrFfskjL1H1dPxTQCiJwh2Rq0ySWlAnCwlAb8G/cTAr/ELYYkMsrQBftDt1j6QnLtPAfpH00RrF9A1vp4QwiNIW5K06vsMPK+NgF1WVgiJIzZ2iSN+UapgQdWvcImEvxR3AZr/Vx892iztNX1YD32b6JfvyGC0Eh4yw4Y7JqTk94nRvTvht9ZN5BpuSoQ6Wdg73gMswCExXsBxL/zQYOPGPKnrVS+v+8H1Rd6HzZ6DinerDtsEnLao6/3zXS7mg+qyk3+uCjbn1s1vSPDT664EnbLGGvYBb2wgrrJvTOke/wObYqwBnjdbJdULD82NLeZrZcLs6Koo5PR9X0H522DudRVapj28HYR5LG3/U6eWtSr6bLkNcB/xZeV96uBwhCfLgu/2KUYixsVMfg8rDplUVQmPBISlhD8wXl4m26c2CxQueM1JlPI7pmVYsWQjerj8n+bM1G2DBvYkOC5F43ffseNCRjJRMZwK9pjaZeCnsG0pxL5HSs5sAWmEkKg7ornezPcp6tIxta6jPus1iEF+jAfoPMwyrJdnPgXSVIudkZVEWlc+mAQJB+I3nRKv2QRvWeG1eZc0DDPJZgePVc59wn5pdO5/fU19qDNOsFqvdCflRq5+LZN+s48gT3Of7/rBOULb0aKsYzVTrq0CF9Zsf2FyKYldEkdXAWsCfQwlav16TtKqbRjC5Ok60t8z+capgYbn+r1pavXSFxFzU8mS3Jejl1P76qUxd/E";
//content = "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";
// content="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";
//content="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";
//content="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";
content ="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";
/*
* 对数据签名 RSA2对应的函数和密钥
*/
......@@ -118,7 +121,7 @@ public class RSAEncryptUtil {
System.out.println("原始sign:" + sign);
Map result = JSON.parseObject(sign);
System.out.println(result);
// System.out.println(result);
}
catch (Exception e){
e.printStackTrace();
......@@ -127,7 +130,7 @@ public class RSAEncryptUtil {
try {
sign = AlipaySignature.rsaDecrypt(resultStr, privateKey, CHARSET);
System.out.println("原始sign:" + sign);
System.out.println("报错原始sign:" + sign);
Map result = JSON.parseObject(sign);
System.out.println(result);
......
package com.cesgroup.kingkong.service.impl;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
......@@ -18,7 +23,6 @@ import com.cesgroup.common.utils.PatentTypeEnum;
import com.cesgroup.common.utils.TypeEnum;
import com.cesgroup.kingkong.mapper.EsMapper;
@Service
public class QueryService {
......@@ -40,7 +44,7 @@ public class QueryService {
String VALID_NAME = "^[A-Za-z][A-Za-z].*[.][0-9]$";
String PRE_VALID_NAME = "^[A-Za-z][A-Za-z].*$";
long ti = System.currentTimeMillis();
System.out.println("开始查询:"+ti);
System.out.println("开始查询:" + ti);
if (isValidId(id, VALID_NAME)) {
if ("zl".equalsIgnoreCase(id.substring(0, 2))) {
id = "CN" + id.substring(2, id.length());
......@@ -61,92 +65,93 @@ public class QueryService {
id = "CN".concat(id);
}
result = queryById(id);
if (result.size()==0 && id.lastIndexOf(".") != -1) {
if (result.size() == 0 && id.lastIndexOf(".") != -1) {
id = id.substring(0, id.lastIndexOf("."));
result = queryById(id);
}
return result;
}
/**
* 查询论文信息
* @return
* Map<String,Object>
*
* @return Map<String,Object>
*/
public Map<String, Object> queryArticleInfo() {
Map<String, Object> result = new HashMap<String, Object>();
String resultJsonString=esMapper.getArticleInfo();
System.out.println("查询出的字符串"+resultJsonString);
String resultJsonString = esMapper.getArticleInfo();
System.out.println("查询出的字符串" + resultJsonString);
result = parseArticleInfo(resultJsonString);
return result;
}
/**
* @Description: 查询论文信息
* @Param: [params]
* @return: java.util.Map<java.lang.String,java.lang.Object>
* @Author: Wanjianbin
* @Date: 2019/9/25
*/
* @Description: 查询论文信息
* @Param: [params]
* @return: java.util.Map<java.lang.String,java.lang.Object>
* @Author: Wanjianbin
* @Date: 2019/9/25
*/
public Map<String, Object> queryArticleInfo(Map<String, Object> params) {
int start = 0;
int count = 10;
StringBuilder queryStr = new StringBuilder();
int start = 0;
int count = 10;
StringBuilder queryStr = new StringBuilder();
// 分页参数
Integer current = MapUtils.getInteger(params, "current");
if(current != null){
start = (current - 1) * 10;
}
// 分页参数
Integer current = MapUtils.getInteger(params, "current");
if (current != null) {
start = (current - 1) * 10;
}
// 组合查询条件字符串
String authorName = MapUtils.getString(params, "authorName");
if(StringUtils.isNotEmpty(authorName)){
queryStr.append("AUTHOR-NAME(");
queryStr.append(authorName);
queryStr.append(")");
}
// 组合查询条件字符串
String authorName = MapUtils.getString(params, "authorName");
if (StringUtils.isNotEmpty(authorName)) {
queryStr.append("AUTHOR-NAME(");
queryStr.append(authorName);
queryStr.append(")");
}
String affilorg = MapUtils.getString(params, "affilorg");
if(StringUtils.isNotEmpty(affilorg)){
if(StringUtils.isNotEmpty(authorName)){
queryStr.append(" AND ");
}
queryStr.append("AFFILORG(");
queryStr.append(affilorg);
queryStr.append(")");
}
String affilorg = MapUtils.getString(params, "affilorg");
if (StringUtils.isNotEmpty(affilorg)) {
if (StringUtils.isNotEmpty(authorName)) {
queryStr.append(" AND ");
}
queryStr.append("AFFILORG(");
queryStr.append(affilorg);
queryStr.append(")");
}
HashMap<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("start", start);
paramMap.put("count", count);
paramMap.put("query", queryStr.toString());
HashMap<String, Object> paramMap = new HashMap<String, Object>();
paramMap.put("start", start);
paramMap.put("count", count);
paramMap.put("query", queryStr.toString());
String resultJsonString=esMapper.getArticleInfo(paramMap);
System.out.println("查询出的字符串: "+resultJsonString);
Map<String, Object> result = parseArticleInfo(resultJsonString);
if(result != null){
List<Map> list = (List<Map>) result.get("entry");
if(list.get(0).get("error") != null){
return null;
}
return result;
}
return null;
String resultJsonString = esMapper.getArticleInfo(paramMap);
System.out.println("查询出的字符串: " + resultJsonString);
Map<String, Object> result = parseArticleInfo(resultJsonString);
if (result != null) {
List<Map> list = (List<Map>) result.get("entry");
if (list.get(0).get("error") != null) {
return null;
}
return result;
}
return null;
}
/**
* 解析论文信息
*
* @param articleInfo
* @return
* Map<String,Object>
* @return Map<String,Object>
*/
private Map<String, Object> parseArticleInfo(String articleInfo) {
if(StringUtils.isNotEmpty(articleInfo)) {
ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
Map<String, Object> result = (Map<String, Object>) JSONObject.parse(articleInfo);
return (Map<String, Object>) result.get("search-results");
}
return null;
if (StringUtils.isNotEmpty(articleInfo)) {
ParserConfig.getGlobalInstance().setAutoTypeSupport(true);
Map<String, Object> result = (Map<String, Object>) JSONObject.parse(articleInfo);
return (Map<String, Object>) result.get("search-results");
}
return null;
}
/**
......@@ -163,9 +168,9 @@ public class QueryService {
/**
* 根据id查询到所有结果
*
* @param id
* @return
* Map<String,Object>
* @return Map<String,Object>
*/
public Map<String, Object> queryById(String id) {
// 需要返回的字段
......@@ -173,34 +178,34 @@ public class QueryService {
Map<String, Object> resultMap = new HashMap<String, Object>();
Map<String, Object> result = new HashMap<String, Object>();
JSONObject sourceJsonObject = null;
String query = new String("{\"_source\":" + fields
+ ",\"query\":{\"bool\":{\"must\":[{\"prefix\":{\"appno\":" + "\"" + id + "\"" + "}}]}}}");
String query = new String("{\"_source\":" + fields + ",\"query\":{\"bool\":{\"must\":[{\"prefix\":{\"appno\":"
+ "\"" + id + "\"" + "}}]}}}");
String resultString = esMapper.postQuery(query);
if(StringUtils.isNotBlank(resultString)) {
if (StringUtils.isNotBlank(resultString)) {
JSONObject hitJsonObject = JSONObject.parseObject(resultString).getJSONObject("hits");
JSONArray hitsArray = (JSONArray) hitJsonObject.get("hits");
if (hitsArray.size() > 0) {
sourceJsonObject = hitsArray.getJSONObject(0).getJSONObject("_source");
result = parseResult(sourceJsonObject);
if(null!=result) {
//查询成功,有结果返回
if (null != result) {
// 查询成功,有结果返回
resultMap.put("resonCode", "200");
resultMap.put("result",result);
}else {
//查询成功,无结果返回,数据模型解析错误
resultMap.put("result", result);
} else {
// 查询成功,无结果返回,数据模型解析错误
resultMap.put("resonCode", "2012");
resultMap.put("result","");
resultMap.put("result", "");
}
}else {
//查询成功,没有结果返回
} else {
// 查询成功,没有结果返回
resultMap.put("resonCode", "2011");
resultMap.put("result","");
resultMap.put("result", "");
}
}else {
//1011 查询超时
} else {
// 1011 查询超时
resultMap.put("resonCode", "1011");
resultMap.put("result","");
}
resultMap.put("result", "");
}
return resultMap;
}
......@@ -221,8 +226,8 @@ public class QueryService {
String pubno = sourceJsonObject.getString("pubno");
String pubkind = sourceJsonObject.getString("pubkind");
JSONObject pmJsonObject = new JSONObject();
pmJsonObject.put("pubno", StringUtils.isNotBlank(pubno)?pubno:"");
pmJsonObject.put("pubkind", StringUtils.isNotBlank(pubkind)?pubkind:"");
pmJsonObject.put("pubno", StringUtils.isNotBlank(pubno) ? pubno : "");
pmJsonObject.put("pubkind", StringUtils.isNotBlank(pubkind) ? pubkind : "");
resultMap.put("publication_number", pmJsonObject);
String publication_date1 = sourceJsonObject.getString("pubdate");
String publication_date = "";
......@@ -230,32 +235,40 @@ public class QueryService {
publication_date = publication_date1.substring(0, 4) + "-" + publication_date1.substring(4, 6) + "-"
+ publication_date1.substring(6, 8);
}
resultMap.put("publication_date", publication_date);
JSONObject legalStatusJsonObject= sourceJsonObject.getJSONObject("legal_status_result");
resultMap.put("legal_status", null!=legalStatusJsonObject?legalStatusJsonObject.getString("legalstatus"):"");
resultMap.put("granted_status",null!=legalStatusJsonObject?legalStatusJsonObject.getString("granted_status"):"");
resultMap.put("publication_date", publication_date);
JSONObject legalStatusJsonObject = sourceJsonObject.getJSONObject("legal_status_result");
resultMap.put("legal_status",
null != legalStatusJsonObject ? legalStatusJsonObject.getString("legalstatus") : "");
resultMap.put("granted_status",
null != legalStatusJsonObject ? legalStatusJsonObject.getString("granted_status") : "");
String kind_code_desc = sourceJsonObject.getString("patent_type");
resultMap.put("kind_code_desc", kind_code_desc);
try {
JSONArray IPC_list = sourceJsonObject.getJSONObject("ipcs").getJSONArray("mainclass");
List<String> ipcNames = new ArrayList<String>();
for (int j = 0; j < IPC_list.size(); j++) {
String nameString = null != IPC_list.getString(j) ? PatentTypeEnum.parse(IPC_list.getString(j)).getMessage().replaceAll(" ", "") : "";
ipcNames.add(nameString);
}
resultMap.put("IPC_list", IPC_list);
resultMap.put("IPC_desc", ipcNames);
}catch (NullPointerException e){
e.printStackTrace();
resultMap.put("IPC_list", null);
resultMap.put("IPC_desc", null);
}
resultMap.put("kind_code_desc", kind_code_desc);
JSONObject ipcJsonObject = sourceJsonObject.getJSONObject("ipcs");
if(null!=ipcJsonObject) {
JSONArray IPC_list = ipcJsonObject.getJSONArray("mainclass");
List<String> ipcNames = new ArrayList<String>();
if(null!=IPC_list) {
for (int j = 0; j < IPC_list.size(); j++) {
String nameString = null != IPC_list.getString(j)
? PatentTypeEnum.parse(IPC_list.getString(j)).getMessage().replaceAll(" ", "")
: "";
ipcNames.add(nameString);
}
resultMap.put("IPC_list", IPC_list);
resultMap.put("IPC_desc", ipcNames);
}else {
resultMap.put("IPC_list", "");
resultMap.put("IPC_desc", "");
}
}else {
resultMap.put("IPC_list", "");
resultMap.put("IPC_desc", "");
}
String appcountry = StringUtils.isNoneBlank(sourceJsonObject.getString("appno"))
? sourceJsonObject.getString("appno").substring(0, 2)
: "";
resultMap.put("appcountry", null!=TypeEnum.parse(appcountry)?TypeEnum.parse(appcountry).getMessage().replaceAll(" ", ""):"");
resultMap.put("appcountry",
null != TypeEnum.parse(appcountry) ? TypeEnum.parse(appcountry).getMessage().replaceAll(" ", "") : "");
JSONArray agengtObjectArray = sourceJsonObject.getJSONArray("agents");
List<String> newAgengts = new ArrayList<String>();
......@@ -284,20 +297,36 @@ public class QueryService {
null != assigneeObject ? StringUtils.isNoneBlank(assigneeObject.getString("name_zh"))
? assigneeObject.getString("name_zh")
: assigneeObject.getString("name_en") : "");
assigneesMap.put("province",
null != assigneeObject
? StringUtils.isNotBlank(assigneeObject.getJSONObject("address_zh").getString("province"))
? assigneeObject.getJSONObject("address_zh").getString("province")
: assigneeObject.getJSONObject("address_en").getString("province")
: "");
assigneesMap.put("city",
null != assigneeObject
? StringUtils.isNotBlank(assigneeObject.getJSONObject("address_zh").getString("city"))
? assigneeObject.getJSONObject("address_zh").getString("city")
: assigneeObject.getJSONObject("address_en").getString("city")
: "");
if (null != assigneeObject) {
JSONObject zhJsonObject = assigneeObject.getJSONObject("address_zh");
JSONObject enJsonObject = assigneeObject.getJSONObject("address_en");
if (null != zhJsonObject) {
assigneesMap.put("province",
StringUtils.isNotBlank(zhJsonObject.getString("province"))
? zhJsonObject.getString("province")
: "");
assigneesMap.put("city",
StringUtils.isNotBlank(zhJsonObject.getString("city")) ? zhJsonObject.getString("city")
: "");
} else if (null != enJsonObject) {
assigneesMap.put("province",
StringUtils.isNotBlank(enJsonObject.getString("province"))
? enJsonObject.getString("province")
: "");
assigneesMap.put("city",
StringUtils.isNotBlank(enJsonObject.getString("city")) ? enJsonObject.getString("city")
: "");
} else {
assigneesMap.put("province", "");
assigneesMap.put("city", "");
}
} else {
assigneesMap.put("province", "");
assigneesMap.put("city", "");
}
newApplicants.add(assigneesMap);
}
resultMap.put("assignees", newApplicants);
JSONArray ownersObjectArray = sourceJsonObject.getJSONArray("owners");
......@@ -309,28 +338,60 @@ public class QueryService {
null != ownersObject ? StringUtils.isNotBlank(ownersObject.getString("name_zh"))
? ownersObject.getString("name_zh")
: ownersObject.getString("name_en") : "");
ownerMap.put("province",
null != ownersObject
? StringUtils.isNoneBlank(ownersObject.getJSONObject("address_zh").getString("province"))
? ownersObject.getJSONObject("address_zh").getString("province")
: ownersObject.getJSONObject("address_en").getString("province")
: "");
ownerMap.put("city",
null != ownersObject
? StringUtils.isNoneBlank(ownersObject.getJSONObject("address_zh").getString("province"))
? ownersObject.getJSONObject("address_zh").getString("city")
: ownersObject.getJSONObject("address_en").getString("city")
: "");
if (null != ownersObject) {
JSONObject ownerZhJsonObject = ownersObject.getJSONObject("address_zh");
JSONObject ownerEnJsonObject = ownersObject.getJSONObject("address_en");
if (null != ownerZhJsonObject) {
ownerMap.put("province",
StringUtils.isNoneBlank(ownerZhJsonObject.getString("province"))
? ownerZhJsonObject.getString("province")
: "");
ownerMap.put("city",
StringUtils.isNoneBlank(ownerZhJsonObject.getString("city"))
? ownerZhJsonObject.getString("city")
: "");
} else if (null != ownerEnJsonObject) {
ownerMap.put("province",
StringUtils.isNoneBlank(ownerEnJsonObject.getString("province"))
? ownerEnJsonObject.getString("province")
: "");
ownerMap.put("city",
StringUtils.isNoneBlank(ownerEnJsonObject.getString("city"))
? ownerEnJsonObject.getString("city")
: "");
} else {
ownerMap.put("province", "");
ownerMap.put("city", "");
}
} else {
ownerMap.put("province", "");
ownerMap.put("city", "");
}
newOwners.add(ownerMap);
}
if(newOwners.size()>0) {
if (newOwners.size() > 0) {
resultMap.put("owners", newOwners);
}else {
resultMap.put("owners", newApplicants);
} else {
try {
ByteArrayOutputStream bo = new ByteArrayOutputStream();
ObjectOutputStream oo = new ObjectOutputStream(bo);
oo.writeObject(newApplicants);
// 从流里读出来
ByteArrayInputStream bi = new ByteArrayInputStream(bo.toByteArray());
ObjectInputStream oi = new ObjectInputStream(bi);
Object aObject= oi.readObject();
resultMap.put("owners", aObject);
} catch (Exception e) {
e.printStackTrace();
}
}
JSONObject abstrJsonObject = sourceJsonObject.getJSONObject("abstract");
String abstract1="";
if(null!=abstrJsonObject) {
abstract1 = StringUtils.isNotBlank(abstrJsonObject.getString("text_zh"))
? abstrJsonObject.getString("text_zh")
: abstrJsonObject.getString("text_en");
}
String abstract1 = StringUtils.isNotBlank(sourceJsonObject.getJSONObject("abstract").getString("text_zh"))
? sourceJsonObject.getJSONObject("abstract").getString("text_zh")
: sourceJsonObject.getJSONObject("abstract").getString("text_en");
resultMap.put("abstract", abstract1);
return resultMap;
}
......
......@@ -28,6 +28,7 @@ public class SearchContrllor {
public RestAPIResult<Object> query(String sign) throws Exception {
Map<String, Object> params = RSAEncryptUtil.resolveParamsForSign(sign, secretKeyService.getById(2));
String id = MapUtils.getString(params, "id");
//String id = "CN86105552";
RestAPIResult<Object> panResult = new RestAPIResult<Object>(secretKeyService);
Map<String, Object> result = null;
if(StringUtils.isNotBlank(id)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment