diff --git a/adc-da-search/pom.xml b/adc-da-search/pom.xml
new file mode 100644
index 00000000..ae2ae633
--- /dev/null
+++ b/adc-da-search/pom.xml
@@ -0,0 +1,245 @@
+
+
+ 4.0.0
+
+
+ com.adc
+ foton-slrs-system-rest
+ 3.0.0
+
+
+ adc-da-search
+ 1.0.0
+
+ jar
+
+
+ UTF-8
+ UTF-8
+ 1.8
+ 1.7
+ 1.8
+ 2.6.6
+ 1.4.0-RC2
+ 4.3.9.RELEASE
+
+
+
+
+ adc
+ http://60.247.58.121:8182/nexus/content/groups/public
+
+ true
+
+
+ true
+
+
+
+
+
+
+
+ thirdparty
+ Nexus Thirdparty Repository
+ http://60.247.58.121:8182/nexus/content/repositories/thirdparty/
+
+
+
+
+
+
+
+
+
+
+ com.adc
+ adc-da-base
+ 2.0.0
+
+
+
+ com.adc
+ adc-da-util
+ 2.2.41
+
+
+ org.bouncycastle
+ bcprov-jdk14
+
+
+
+
+
+ com.adc
+ adc-da-sys
+ 3.0.0
+
+
+
+
+ com.adc
+ adc-da-file
+ 2.2.0
+
+
+
+ com.adc
+ adc-da-druid
+ 2.0.0
+
+
+ com.adc
+ adc-da-excel
+ 2.0.3
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-amqp
+
+
+ org.elasticsearch.client
+ transport
+ 6.3.2
+
+
+ org.elasticsearch
+ elasticsearch
+ 6.3.2
+
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-jetty
+
+
+ org.mybatis.spring.boot
+ mybatis-spring-boot-starter
+ 1.2.0
+
+
+
+ net.sourceforge.javacsv
+ javacsv
+ 2.0
+
+
+ net.sf.opencsv
+ opencsv
+ 2.3
+
+
+
+ com.alibaba
+ fastjson
+ 1.2.9
+
+
+ com.google.guava
+ guava
+ 19.0
+
+
+ com.mashape.unirest
+ unirest-java
+ 1.4.9
+
+
+
+ net.sf.json-lib
+ json-lib
+ 2.4
+ jdk15
+
+
+ commons-logging
+ commons-logging
+
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-collections
+ commons-collections
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.4.1
+
+
+ org.apache.httpcomponents
+ httpcore
+ 4.4.1
+
+
+
+ org.aspectj
+ aspectjweaver
+
+
+
+
+ cn.afterturn
+ easypoi-base
+ 4.1.2
+
+
+ cn.afterturn
+ easypoi-web
+ 4.1.2
+
+
+ cn.afterturn
+ easypoi-annotation
+ 4.1.2
+
+
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+ ${java.version}
+ ${java.version}
+ ${java.version}
+ ${project.build.sourceEncoding}
+
+
+
+
+
+
diff --git a/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java
new file mode 100644
index 00000000..26fec5b6
--- /dev/null
+++ b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchConfig.java
@@ -0,0 +1,57 @@
+package com.adc.da.search.config;
+
+
+import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * gaoyan
+ * 2018-08-23
+ * elasticsearch配置config
+ */
+@Configuration
+public class ElasticsearchConfig {
+
+ private static final Logger logger = LoggerFactory.getLogger(ElasticsearchConfig.class);
+
+ @Autowired
+ private ElasticsearchProperties elasticsearchProperties;
+
+ @Bean
+ public TransportClient client() throws UnknownHostException {
+ TransportClient client = null;
+ try {
+ Settings settings = Settings.builder()
+ .put("client.transport.sniff", true)//增加嗅探机制,找到ES集群
+ .put("thread_pool.search.size", elasticsearchProperties.getPoolSize())//增加线程池个数,暂时设为5
+ .put("cluster.name",elasticsearchProperties.getClustername())
+ .build();
+ client = new PreBuiltTransportClient(settings)
+ .addTransportAddress(new TransportAddress(InetAddress.getByName(elasticsearchProperties.getIp()),elasticsearchProperties.getPort()));
+ } catch (java.net.UnknownHostException e) {
+ logger.error(e.getMessage(),e);
+ }
+ return client;
+ }
+
+ /*@After
+ public void tearDown() throws Exception {
+ if (client != null) {
+ client.close();
+ }
+
+ }*/
+
+
+}
diff --git a/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java
new file mode 100644
index 00000000..d0f4b9d1
--- /dev/null
+++ b/adc-da-search/src/main/java/com/adc/da/search/config/ElasticsearchProperties.java
@@ -0,0 +1,45 @@
+package com.adc.da.search.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "elasticsearch")
+public class ElasticsearchProperties {
+ private String clustername;
+ private String ip;
+ private Integer port;
+ private Integer poolSize;
+
+ public String getClustername() {
+ return clustername;
+ }
+
+ public void setClustername(String clustername) {
+ this.clustername = clustername;
+ }
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public Integer getPort() {
+ return port;
+ }
+
+ public void setPort(Integer port) {
+ this.port = port;
+ }
+
+ public Integer getPoolSize() {
+ return poolSize;
+ }
+
+ public void setPoolSize(Integer poolSize) {
+ this.poolSize = poolSize;
+ }
+}
diff --git a/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
new file mode 100644
index 00000000..27957f6f
--- /dev/null
+++ b/adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
@@ -0,0 +1,328 @@
+package com.adc.da.search.controller;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
+import com.adc.da.base.web.BaseController;
+import com.adc.da.person.service.PersonCollectEOService;
+import com.adc.da.search.dto.*;
+import com.adc.da.search.entity.SarAdvanceSearchVO;
+import com.adc.da.search.entity.SeniorSearchInfoEO;
+import com.adc.da.search.service.ElasticsearchService;
+import com.adc.da.search.service.SearchCenterService;
+import com.adc.da.util.exception.AdcDaBaseException;
+import com.adc.da.util.http.PageInfo;
+import com.adc.da.util.http.ResponseMessage;
+import com.adc.da.util.http.Result;
+import com.adc.da.util.utils.IOUtils;
+import com.adc.da.util.utils.StringUtils;
+import com.alibaba.fastjson.JSONObject;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.elasticsearch.client.transport.TransportClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Pattern;
+
+import static com.adc.da.sys.common.ReadExcelName.encodeFileName;
+
+@RestController
+@RequestMapping("/${restPath}/search/searchCenter")
+@Api(description = "|SearchCenter|")
+public class SearchCenterController extends BaseController