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

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
index 266bc21..1f37e01 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java
@@ -12,6 +12,7 @@
 import com.vincent.rsf.server.common.domain.PageParam;
 import com.vincent.rsf.server.manager.entity.Container;
 import com.vincent.rsf.server.manager.service.ContainerService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
 import com.vincent.rsf.server.system.controller.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,25 +32,26 @@
     public R page(@RequestBody Map<String, Object> map) {
         BaseParam baseParam = buildParam(map, BaseParam.class);
         PageParam<Container, BaseParam> pageParam = new PageParam<>(baseParam, Container.class);
-        return R.ok().add(containerService.page(pageParam, pageParam.buildWrapper(true)));
+        PageParam<Container, BaseParam> page = containerService.page(pageParam, pageParam.buildWrapper(true));
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
     @PreAuthorize("hasAuthority('manager:container:list')")
     @PostMapping("/container/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(containerService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(containerService.list()));
     }
 
     @PreAuthorize("hasAuthority('manager:container:list')")
     @PostMapping({"/container/many/{ids}", "/containers/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(containerService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(containerService.listByIds(Arrays.asList(ids))));
     }
 
     @PreAuthorize("hasAuthority('manager:container:list')")
     @GetMapping("/container/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(containerService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(containerService.getById(id)));
     }
 
     @PreAuthorize("hasAuthority('manager:container:save')")
@@ -67,7 +69,7 @@
         if (!containerService.save(container)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(container);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(container));
     }
 
     @PreAuthorize("hasAuthority('manager:container:update')")
@@ -79,7 +81,7 @@
         if (!containerService.updateById(container)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(container);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(container));
     }
 
     @PreAuthorize("hasAuthority('manager:container:remove')")
@@ -93,7 +95,7 @@
         if (!containerService.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:container:list')")
@@ -107,7 +109,7 @@
         containerService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
                 item -> vos.add(new KeyValVo(item.getId(), item.getName()))
         );
-        return R.ok().add(vos);
+        return R.ok().add(buildPageRowsUtils.rowsMap(vos));
     }
 
     @PreAuthorize("hasAuthority('manager:container:list')")
@@ -119,7 +121,7 @@
         } else {
             containers = containerService.list();
         }
-        ExcelUtil.build(ExcelUtil.create(containers, Container.class), response);
+        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(containers), Container.class), response);
     }
 
 }

--
Gitblit v1.9.1