FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:升级es到7.6.2

Browse Source
This commit is contained in:
2510220824
2021-07-28 15:35:45 +08:00
parent cb48c13635
commit de8f5631c0
8 changed files with 609 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/controller/SearchCenterController.java
+22 -11
View File
@@ -4,21 +4,21 @@ import com.adc.da.base.web.BaseController;
import com.adc.da.excel.poi.excel.ExcelExportUtil;
import com.adc.da.excel.poi.excel.entity.ExportParams;
import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.search.dto.*;
import com.adc.da.search.dto.SearchBussExportDto;
import com.adc.da.search.dto.SearchLawsExportDto;
import com.adc.da.search.dto.SearchMsgExportDto;
import com.adc.da.search.dto.SearchStandExportDto;
import com.adc.da.search.entity.CommonSearchInfoEO;
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.exception.AdcDaBaseException;
import com.adc.da.http.ResponseMessage;
import com.adc.da.http.Result;
import com.adc.da.slrs.tsDictionaryType.entity.TsSearchMenu;
import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
import com.adc.da.util.IOUtils;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,14 +26,25 @@ import org.apache.commons.lang3.StringUtils;
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.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
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.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
import static com.adc.da.sys.common.ReadExcelName.encodeFileName;
@RestController
@@ -52,14 +63,14 @@ public class SearchCenterController extends BaseController<Map<String, Object>>
@Autowired
private ElasticsearchService elasticsearchService;
@Autowired
/*@Autowired
private ITsDicTypeService iTsDictypeService;
@ApiOperation("获取筛选条件")
@PostMapping("/getMenu")
public ResponseMessage<List<TsSearchMenu>> getSearchMenu(){
return Result.success(iTsDictypeService.getSearchMenu());
}
}*/
/**
*