Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -112,11 +112,11 @@
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
-      <dependency>
+<!--       <dependency>
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
           <version>8.0.18</version>
-      </dependency>
+      </dependency> -->
       <dependency>
           <groupId>com.belerweb</groupId>
           <artifactId>pinyin4j</artifactId>

src/main/java/com/cesgroup/common/utils/RestAPIResult.java

 package com.cesgroup.common.utils;
 
 
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
 import com.alibaba.fastjson.JSON;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.internal.util.AlipaySignature;
 import com.cesgroup.kingkong.entity.SecretKeyEntity;
 import com.cesgroup.kingkong.service.SecretKeyService;
-import org.apache.commons.collections.MapUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 
 /**

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

@@ -17,12 +17,14 @@ public class EsMapper {
 
 	@Value("${articlesearch.HostAddress}")
     private String arHostAddress ="";
+	//配置专利索引别名
+	private final static String PATENT_INDEX_ALIAS = "patent_yun";
 	
 	@Autowired
 	private HttpClientHelper httpClientHelper;
 	
 	public String postQuery(String query) {
-		String uriString =esHostAddress+"/"+"patent*/"+"_search/";
+		String uriString =esHostAddress+"/"+PATENT_INDEX_ALIAS+"/"+"_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

 package com.cesgroup.kingkong.service.impl;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import com.alibaba.fastjson.parser.ParserConfig;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.ParserConfig;
 import com.cesgroup.common.utils.PatentTypeEnum;
 import com.cesgroup.common.utils.TypeEnum;
 import com.cesgroup.kingkong.mapper.EsMapper;
@@ -61,13 +61,10 @@ public class QueryService {
 			id = "CN".concat(id);
 		}
 		result = queryById(id);
-		System.out.println("结束查询1："+(System.currentTimeMillis()-ti));
 		if (result.size()==0 && id.lastIndexOf(".") != -1) {
 			id = id.substring(0, id.lastIndexOf("."));
 			result = queryById(id);
 		}
-		System.out.println("结束查询2："+(System.currentTimeMillis()-ti));
-		System.out.println("查询id: " + id);
 		return result;
 	}
 	/**
@@ -177,7 +174,7 @@ public class QueryService {
 		Map<String, Object> result = new HashMap<String, Object>();
 		JSONObject sourceJsonObject = null;
 		String query = new String("{\"_source\":" + fields
-				+ ",\"query\":{\"bool\":{\"must\":[{\"prefix\":{\"appno.keyword\":" + "\"" + id + "\"" + "}}]}}}");
+				+ ",\"query\":{\"bool\":{\"must\":[{\"prefix\":{\"appno\":" + "\"" + id + "\"" + "}}]}}}");
 		String resultString = esMapper.postQuery(query);
 		if(StringUtils.isNotBlank(resultString)) {
 			JSONObject hitJsonObject = JSONObject.parseObject(resultString).getJSONObject("hits");