diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java index 9534c1837..16ebc6d0e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/controller/DocumentSearchController.java @@ -65,13 +65,11 @@ public class DocumentSearchController { @ApiOperation(value="列表查询", notes="列表查询") @GetMapping(value = "/getInfoList") - public Result getInfoList(@RequestParam(name="indexName",required=true) String indexName, - @RequestParam(name="typeName",required=true) String typeName, - @RequestParam(name="map",required=false) Map map) { + public Result getInfoList(@RequestParam(name="map",required=false) Map map) { map =new HashMap<>(); // map.put("_source","serial_number"); // map.put("_source","implement_time"); - JSONObject infoList = iDocumentSearchService.getInfoList(indexName, typeName, map); + JSONObject infoList = iDocumentSearchService.getInfoList(map); return Result.OK(infoList); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java index 3cbbf319f..8d15e9ab2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/DocumentSearchServiceImpl.java @@ -54,7 +54,7 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } @Override - public JSONObject getInfoList(String indexName, String typeName, Map map) { + public JSONObject getInfoList(Map map) { //文档库所有的字段 List fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); //需要查询的列表字段 @@ -120,8 +120,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService { } } - indexName = "documentLibrary"; - typeName = "document"; + String indexName = "documentLibrary"; + String typeName = "document"; // String json = JSON.toJSONString(map);//map转String // JSONObject queryObject = JSON.parseObject(json); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java index 71b75fbc1..4e8e3611a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/searchcenter/service/impl/IDocumentSearchService.java @@ -16,6 +16,6 @@ public interface IDocumentSearchService { List> getHeader(String flag, String cut,String searchFla); - JSONObject getInfoList(String indexName, String typeName, Map map); + JSONObject getInfoList(Map map); }