*）修改ES查询为空时异常

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/config/ElasticSearchClientConfig.java

+package com.yeejoin.amos.boot.module.jcs.biz.config;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHost;
+import org.apache.http.client.config.RequestConfig;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+ 
+@Configuration
+public class ElasticSearchClientConfig {
+ 
+	@Value("${spring.elasticsearch.rest.uris}")
+    private String uris;
+	 
+	@Bean
+	@Qualifier("highLevelClient")
+	public RestHighLevelClient restHighLevelClient() {
+ 
+		
+        try {
+        	String url = uris.replace("http://", "");
+        	final String[] parts = StringUtils.split(url, ":");
+        	HttpHost httpHost = new HttpHost(parts[0], Integer.parseInt(parts[1]), "http");
+        	RestClientBuilder builder = RestClient.builder(httpHost);
+        	builder.setRequestConfigCallback(new RestClientBuilder.RequestConfigCallback() {
+				// 该方法接收一个RequestConfig.Builder对象，对该对象进行修改后然后返回。
+				@Override
+				public RequestConfig.Builder customizeRequestConfig(
+						RequestConfig.Builder requestConfigBuilder) {
+					return requestConfigBuilder.setConnectTimeout(5000 * 1000) // 连接超时（默认为1秒）
+							.setSocketTimeout(6000 * 1000);// 套接字超时（默认为30秒）//更改客户端的超时限制默认30秒现在改为100*1000分钟
+				}
+			});// 调整最大重试超时时间（默认为30秒）.setMaxRetryTimeoutMillis(60000);
+        	
+        	
+        	return new RestHighLevelClient(builder);
+        } catch (Exception e) {
+        	throw new IllegalStateException("Invalid ES nodes " + "property '" + uris + "'", e);
+        }
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ESAlertCalledService.java

@@ -27,12 +27,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.ESAlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.enums.AlertStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.biz.dao.ESAlertCalledRepository;
-
-import javax.annotation.PostConstruct;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  *
  * <pre>
@@ -274,18 +268,26 @@ public class ESAlertCalledService {
                 //过滤条件
                 .withQuery(boolMust);
 
-//         对高亮词条进行操作
-        SearchHits<ESAlertCalled> searchHits =elasticsearchTemplate.search(queryBuilder.build(), ESAlertCalled.class);
-
         List<ESAlertCalledDto> list = new LinkedList<>();
-        for (SearchHit searchHit : searchHits.getSearchHits())
+        long totle = 0;
+		try
+		{
+			SearchHits<ESAlertCalled> searchHits =elasticsearchTemplate.search(queryBuilder.build(), ESAlertCalled.class);
+			
+			for (SearchHit searchHit : searchHits.getSearchHits())
+			{
+				JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
+				ESAlertCalledDto eSAlertCalled =JSONObject.toJavaObject(jsonObject, ESAlertCalledDto.class);
+				list.add(eSAlertCalled);
+			}
+			totle =searchHits.getTotalHits();
+		}
+		catch (Exception e)
 		{
-        	JSONObject jsonObject = (JSONObject) JSONObject.toJSON(searchHit.getContent());
-        	ESAlertCalledDto eSAlertCalled =JSONObject.toJavaObject(jsonObject, ESAlertCalledDto.class);
-        	list.add(eSAlertCalled);
+			// TODO: handle exception
 		}
         result.setRecords(list);
-        result.setTotal(searchHits.getTotalHits());
+        result.setTotal(totle);
 
         return result;
     }