diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/AbstractCrudController.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/AbstractCrudController.java index 604d16b3..565ca0dd 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/AbstractCrudController.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/controller/AbstractCrudController.java @@ -185,8 +185,8 @@ public void batchDelete(@RequestBody @Valid IdsReq req) { @ExcludeFromGracefulResponse @Operation(summary = "导出数据", description = "导出数据") @GetMapping("/export") - public void export(@Valid Q query, @Valid SortQuery sortQuery, HttpServletResponse response) { - baseService.export(query, sortQuery, response); + public void export(@Valid Q query, @Valid SortQuery sortQuery, String fileName, HttpServletResponse response) { + baseService.export(query, sortQuery, fileName, response); } /** diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/CrudService.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/CrudService.java index d0da0436..c38d94dd 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/CrudService.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-core/src/main/java/top/continew/starter/extension/crud/service/CrudService.java @@ -126,9 +126,10 @@ public interface CrudService { * * @param query 查询条件 * @param sortQuery 排序查询条件 + * @param fileName 导出的文件名称 * @param response 响应对象 */ - void export(@Valid Q query, @Valid SortQuery sortQuery, HttpServletResponse response); + void export(@Valid Q query, @Valid SortQuery sortQuery, String fileName, HttpServletResponse response); /** * 查询字典列表 diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index bf701022..9eb30958 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mf/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -167,10 +167,16 @@ public void delete(List ids) { } @Override - public void export(Q query, SortQuery sortQuery, HttpServletResponse response) { + public void export(Q query, SortQuery sortQuery, String fileName, HttpServletResponse response) { List list = this.list(query, sortQuery, detailClass); list.forEach(this::fill); - ExcelUtils.export(list, "导出数据", detailClass, response); + if (fileName == null) { + fileName = "导出数据"; + } + if (fileName.endsWith(".xlsx")) { + fileName = fileName.substring(0, fileName.length() - 5); + } + ExcelUtils.export(list, fileName, detailClass, response); } @Override diff --git a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java index a2955399..a89a6d7d 100644 --- a/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java +++ b/continew-starter-extension/continew-starter-extension-crud/continew-starter-extension-crud-mp/src/main/java/top/continew/starter/extension/crud/service/CrudServiceImpl.java @@ -169,10 +169,16 @@ public void delete(List ids) { } @Override - public void export(Q query, SortQuery sortQuery, HttpServletResponse response) { + public void export(Q query, SortQuery sortQuery, String fileName, HttpServletResponse response) { List list = this.list(query, sortQuery, this.getDetailClass()); list.forEach(this::fill); - ExcelUtils.export(list, "导出数据", this.getDetailClass(), response); + if (fileName == null) { + fileName = "导出数据"; + } + if (fileName.endsWith(".xlsx")) { + fileName = fileName.substring(0, fileName.length() - 5); + } + ExcelUtils.export(list, fileName, this.getDetailClass(), response); } @Override