feat 修改了一些搜索模块

This commit is contained in:
yinglong zhang
2021-06-29 09:07:06 +08:00
parent 26a5022c03
commit 4533960ef9
25 changed files with 512 additions and 46 deletions
@@ -7,6 +7,7 @@ import com.adc.da.excel.poi.excel.entity.enums.ExcelType;
import com.adc.da.http.PageInfo;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.search.dto.*;
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;
@@ -14,6 +15,8 @@ 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;
@@ -23,10 +26,7 @@ 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -52,6 +52,15 @@ public class SearchCenterController extends BaseController<Map<String, Object>>
@Autowired
private ElasticsearchService elasticsearchService;
@Autowired
private ITsDicTypeService iTsDictypeService;
@ApiOperation("获取筛选条件")
@PostMapping("/getMenu")
public ResponseMessage<List<TsSearchMenu>> getSearchMenu(){
return Result.success(iTsDictypeService.getSearchMenu());
}
/**
*
* @param searchInfoEO
@@ -98,6 +107,14 @@ public class SearchCenterController extends BaseController<Map<String, Object>>
}
}
@ApiOperation("根据多个key去查询")
@PostMapping("/searchByKey")
public void searchByKey(@RequestBody CommonSearchInfoEO commonSearchInfoEO){
searchCenterService.searchByKey(commonSearchInfoEO);
}
@ApiOperation(value = "|SearchCenter|查询用于导出数据")
@PostMapping(value="/searchIdToImport")
public ResponseMessage<String []> searchIdToImport(SeniorSearchInfoEO searchInfoEO){