From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
index 94628df..726c6cc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveController.java
@@ -57,26 +57,25 @@
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<Wave, BaseParam> pageParam = new PageParam<>(baseParam, Wave.class);
         PageParam<Wave, BaseParam> page = waveService.page(pageParam, pageParam.buildWrapper(true));
-        buildPageRowsUtils.userNameMap(page.getRecords());
-        return R.ok().add(page);
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
     @PreAuthorize("hasAuthority('manager:wave:list')")
     @PostMapping("/wave/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(waveService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(waveService.list()));
     }
 
     @PreAuthorize("hasAuthority('manager:wave:list')")
     @PostMapping({"/wave/many/{ids}", "/waves/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(waveService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(waveService.listByIds(Arrays.asList(ids))));
     }
 
     @PreAuthorize("hasAuthority('manager:wave:list')")
     @GetMapping("/wave/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(waveService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(waveService.getById(id)));
     }
 
     @PreAuthorize("hasAuthority('manager:wave:save')")
@@ -88,7 +87,7 @@
         if (!waveService.save(wave)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(wave);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(wave));
     }
 
     @PreAuthorize("hasAuthority('manager:wave:update')")
@@ -101,7 +100,7 @@
         if (!waveService.updateById(wave)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(wave);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(wave));
     }
 
     @PreAuthorize("hasAuthority('manager:wave:remove')")
@@ -130,13 +129,13 @@
         waveService.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:wave:list')")
     @PostMapping("/wave/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(waveService.list(), Wave.class), response);
+        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waveService.list()), Wave.class), response);
     }
 
     @PreAuthorize("hasAuthority('manager:wave:update')")
@@ -170,7 +169,7 @@
         List<WaveItem> waveItems = waveService.mergeWavePreview(waveId);
         PageResult<WaveItem> pageResult = new PageResult<>();
         pageResult.setRecords(waveItems).setTotal(Long.parseLong(waveItems.size() + ""));
-        return R.ok().add(pageResult);
+        return R.ok().add(buildPageRowsUtils.rowsMap(pageResult));
     }
 
     @PreAuthorize("hasAuthority('manager:waveItem:update')")

--
Gitblit v1.9.1