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/system/controller/DictDataController.java |   40 +++++++++++++++++++++-------------------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
index f450eb6..436d68c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/DictDataController.java
@@ -16,8 +16,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.*;
 
 @RestController
@@ -26,33 +27,33 @@
     @Autowired
     private DictDataService dictDataService;
 
-    @PreAuthorize("hasAuthority('system:dictData:list')")
+    @PreAuthorize("hasAuthority('system:dictType:list')")
     @PostMapping("/dictData/page")
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<DictData, BaseParam> pageParam = new PageParam<>(baseParam, DictData.class);
-        return R.ok().add(dictDataService.page(pageParam, pageParam.buildWrapper(true)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.page(pageParam, pageParam.buildWrapper(true))));
     }
 
-    @PreAuthorize("hasAuthority('system:dictData:list')")
+    @PreAuthorize("hasAuthority('system:dictType:list')")
     @PostMapping("/dictData/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(dictDataService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.list()));
     }
 
-    @PreAuthorize("hasAuthority('system:dictData:list')")
+    @PreAuthorize("hasAuthority('system:dictType:list')")
     @PostMapping({"/dictData/many/{ids}", "/dictDatas/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(dictDataService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.listByIds(Arrays.asList(ids))));
     }
 
-    @PreAuthorize("hasAuthority('system:dictData:list')")
+    @PreAuthorize("hasAuthority('system:dictType:list')")
     @GetMapping("/dictData/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(dictDataService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(dictDataService.getById(id)));
     }
 
-    @PreAuthorize("hasAuthority('system:dictData:save')")
+    @PreAuthorize("hasAuthority('system:dictType:save')")
     @OperationLog("Create 瀛楀吀鏁版嵁闆�")
     @PostMapping("/dictData/save")
     public R save(@RequestBody DictData dictData) {
@@ -73,10 +74,10 @@
         if (!dictDataService.save(dictData)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(dictData);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(dictData));
     }
 
-    @PreAuthorize("hasAuthority('system:dictData:update')")
+    @PreAuthorize("hasAuthority('system:dictType:update')")
     @OperationLog("Update 瀛楀吀鏁版嵁闆�")
     @PostMapping("/dictData/update")
     public R update(@RequestBody DictData dictData) {
@@ -85,20 +86,20 @@
         if (!dictDataService.updateById(dictData)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(dictData);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(dictData));
     }
 
-    @PreAuthorize("hasAuthority('system:dictData:remove')")
+    @PreAuthorize("hasAuthority('system:dictType:remove')")
     @OperationLog("Delete 瀛楀吀鏁版嵁闆�")
     @PostMapping("/dictData/remove/{ids}")
     public R remove(@PathVariable Long[] ids) {
         if (!dictDataService.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('system:dictData:list')")
+    @PreAuthorize("hasAuthority('system:dictType:list')")
     @PostMapping("/dictData/query")
     public R query(@RequestParam(required = false) String condition) {
         List<KeyValVo> vos = new ArrayList<>();
@@ -109,13 +110,14 @@
         dictDataService.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('system:dictData:list')")
+    @PreAuthorize("hasAuthority('system:dictType:list')")
     @PostMapping("/dictData/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(dictDataService.list(), DictData.class), response);
+        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(dictDataService.list()), DictData.class), response);
     }
 
 }
+

--
Gitblit v1.9.1