返回码，更新

src/main/java/com/cesgroup/kingkong/mapper/EsMapper.java

@@ -20,6 +20,7 @@ public class EsMapper {
 	
 	public String postQuery(String query) {
 		String uriString =esHostAddress+"/"+"patent*/"+"_search/";
+		//String uriString =esHostAddress+"/"+"testhbase*/"+"_search/";
 		HashMap<String, Object> header = new HashMap<String, Object>();
 		String result = httpClientHelper.postJSON(uriString, query, header);
 		return result;

src/main/java/com/cesgroup/kingkong/service/impl/QueryService.java

@@ -85,16 +85,36 @@ public class QueryService {
 		// 需要返回的字段
 		String fields = "[\"title\",\"legal_status_result\",\"appno\",\"appdate\",\"pubno\",\"pubdate\",\"legal_status\",\"granted_status\",\"patent_type\",\"ipcs\",\"agents\",\"inventors\",\"applicants\",\"owners\",\"abstract\"]";
 		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.keyword\":" + "\"" + id + "\"" + "}}]}}}");
 		String resultString = esMapper.postQuery(query);
-		JSONObject hitJsonObject = JSONObject.parseObject(resultString).getJSONObject("hits");
-		JSONArray hitsArray = (JSONArray) hitJsonObject.get("hits");
-		if (hitsArray.size() > 0) {
-			sourceJsonObject = hitsArray.getJSONObject(0).getJSONObject("_source");
-			resultMap = parseResult(sourceJsonObject);
-		}
+		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) {
+					//查询成功，有结果返回
+					resultMap.put("resonCode", "200");
+					resultMap.put("result",result);
+				}else {
+					//查询成功，无结果返回，数据模型解析错误
+					resultMap.put("resonCode", "2012");
+					resultMap.put("result","");
+				}
+			}else {
+				//查询成功，没有结果返回
+				resultMap.put("resonCode", "2011");
+				resultMap.put("result","");
+			}
+		}else {
+			//1011 查询超时
+			resultMap.put("resonCode", "1011");
+			resultMap.put("result","");
+		}	
 		return resultMap;
 	}
 

src/main/java/com/cesgroup/kingkong/web/SearchContrllor.java

@@ -20,21 +20,39 @@ public class SearchContrllor {
 	@Autowired
 	private QueryService queryService;
 	@RequestMapping(value = "queryById", method = { RequestMethod.POST })
-	public RestAPIResult<Map<String, Object>> query(String id) {
-		RestAPIResult<Map<String, Object>> panResult = new RestAPIResult<Map<String, Object>>();
+	public RestAPIResult<Object> query(String id) {
+		RestAPIResult<Object> panResult = new RestAPIResult<Object>();
 		Map<String, Object> result = null;
 		if(StringUtils.isNotBlank(id)) {
 			result =queryService.getById(id);
-			if (null!=result) {
+			String respCodeString = (String) result.get("resonCode");
+			if (respCodeString.equals("200")) {
 				panResult.isSuccess();
-				panResult.setRespMsg("信息查询成功！");
-				panResult.setRespData(result);
-			} else {
+				panResult.setRespMsg("文档信息查询成功！");
+				panResult.setRespData(result.get("result"));
+				panResult.setRespCode(Integer.parseInt(respCodeString));
+			} else if(respCodeString.equals("2011")) {
+				panResult.isSuccess();
+				panResult.setRespMsg("文档id不存在！");
+				panResult.setRespData(result.get("result"));
+				panResult.setRespCode(Integer.parseInt(respCodeString));
+			}else if(respCodeString.equals("2012")) {
+				panResult.isSuccess();
+				panResult.setRespMsg("文档解析失败");
+				panResult.setRespData(result.get("result"));
+				panResult.setRespCode(Integer.parseInt(respCodeString));
+			}else if(respCodeString.equals("1011")) {
+				panResult.isSuccess();
+				panResult.setRespMsg("文档查询超时！");
+				panResult.setRespData(result.get("result"));
+				panResult.setRespCode(Integer.parseInt(respCodeString));
+			}else  {
 				panResult.error();
-				panResult.setRespMsg("信息查询失败！");
+				panResult.setRespMsg("其他错误！");
 			}
 		}else {
-			panResult.error("参数不能为空");
+			panResult.error("查询参数错误");
+			panResult.setRespCode(1012);
 		}
 		return panResult;
 	}