From 34d36a15f339d331d668d4063cfdff50cffa5800 Mon Sep 17 00:00:00 2001
From: zhou zhou <zozhouo3o@gmail.com>
Date: 星期五, 17 四月 2026 15:11:32 +0800
Subject: [PATCH] #导出服务
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
index b022be8..61881f6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseAreasItemController.java
@@ -10,13 +10,17 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
+import com.vincent.rsf.server.common.service.AsyncListExportTaskService;
import com.vincent.rsf.server.common.service.ListExportHandler;
import com.vincent.rsf.server.common.service.ListExportService;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.common.utils.FileServerUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.WarehouseAreasItem;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.entity.ExportTask;
import io.swagger.annotations.Api;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
@@ -25,16 +29,24 @@
import org.springframework.web.bind.annotation.*;
import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import java.io.File;
import java.util.*;
@Api(tags = "搴撳尯搴撳瓨鏄庣粏")
@RestController
public class WarehouseAreasItemController extends BaseController {
+ private static final String EXPORT_RESOURCE_KEY = "warehouseAreasItem";
+ private static final String EXPORT_DEFAULT_REPORT_TITLE = "鏀惰揣搴撳瓨鎶ヨ〃";
+
@Autowired
private WarehouseAreasItemService warehouseAreasItemService;
@Autowired
private ListExportService listExportService;
+
+ @Autowired
+ private AsyncListExportTaskService asyncListExportTaskService;
private final ListExportHandler<WarehouseAreasItem, BaseParam> warehouseAreasItemExportHandler = new ListExportHandler<>() {
@Override
@@ -62,7 +74,7 @@
@Override
public String defaultReportTitle() {
- return "鏀惰揣搴撳瓨鎶ヨ〃";
+ return EXPORT_DEFAULT_REPORT_TITLE;
}
};
@@ -84,7 +96,7 @@
}
}
page.setRecords(records);
- return R.ok().add(page);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@@ -104,26 +116,26 @@
}
}
page.setRecords(records);
- return R.ok().add(page);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@PostMapping("/warehouseAreasItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok(warehouseAreasItemService.getList());
-// return R.ok().add(warehouseAreasItemService.list());
+// return R.ok().add(buildPageRowsUtils.rowsMap(warehouseAreasItemService.list()));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list' )")
@PostMapping({"/warehouseAreasItem/many/{ids}", "/warehouseAreasItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(warehouseAreasItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseAreasItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@GetMapping("/warehouseAreasItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(warehouseAreasItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseAreasItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
@@ -135,7 +147,7 @@
if (!warehouseAreasItemService.save(warehouseAreasItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(warehouseAreasItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(warehouseAreasItem));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:update')")
@@ -147,7 +159,7 @@
if (!warehouseAreasItemService.updateById(warehouseAreasItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(warehouseAreasItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(warehouseAreasItem));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:remove')")
@@ -157,7 +169,7 @@
if (!warehouseAreasItemService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
@@ -171,10 +183,10 @@
warehouseAreasItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
- @PreAuthorize("hasAuthority('manager:warehouseAreasItem:list')")
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:export')")
@PostMapping("/warehouseAreasItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
listExportService.export(
@@ -185,6 +197,57 @@
);
}
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:export')")
+ @PostMapping("/warehouseAreasItem/export/async")
+ public R createAsyncExportTask(@RequestBody Map<String, Object> map) {
+ ExportTask task = asyncListExportTaskService.createTask(
+ EXPORT_RESOURCE_KEY,
+ EXPORT_DEFAULT_REPORT_TITLE,
+ map,
+ getTenantId(),
+ getLoginUserId()
+ );
+ asyncListExportTaskService.executeAsync(
+ task.getId(),
+ EXPORT_RESOURCE_KEY,
+ new HashMap<>(map),
+ exportMap -> buildParam(exportMap, BaseParam.class),
+ warehouseAreasItemExportHandler
+ );
+ return R.ok("瀵煎嚭浠诲姟宸插垱寤�").add(buildPageRowsUtils.rowsMap(task));
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:export')")
+ @GetMapping("/warehouseAreasItem/export/task/{taskId}")
+ public R getExportTask(@PathVariable("taskId") Long taskId) {
+ ExportTask task = asyncListExportTaskService.getTask(
+ taskId,
+ EXPORT_RESOURCE_KEY,
+ getTenantId(),
+ getLoginUserId()
+ );
+ if (task == null) {
+ return R.error("瀵煎嚭浠诲姟涓嶅瓨鍦�");
+ }
+ return R.ok().add(buildPageRowsUtils.rowsMap(task));
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreasItem:export')")
+ @GetMapping("/warehouseAreasItem/export/task/{taskId}/download")
+ public void downloadExportTask(
+ @PathVariable("taskId") Long taskId,
+ HttpServletResponse response,
+ HttpServletRequest request
+ ) {
+ File file = asyncListExportTaskService.getDownloadFile(
+ taskId,
+ EXPORT_RESOURCE_KEY,
+ getTenantId(),
+ getLoginUserId()
+ );
+ FileServerUtil.preview(file, true, file.getName(), null, null, response, request);
+ }
+
private void fillExtendFields(List<WarehouseAreasItem> records) {
for (WarehouseAreasItem record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
--
Gitblit v1.9.1