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/system/controller/UserController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
index 9f2f7fd..512cb2a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/UserController.java
@@ -23,8 +23,9 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
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
@@ -48,25 +49,25 @@
for (User record : pageResult.getRecords()) {
record.setRoles(userRoleService.listByUserId(record.getId()));
}
- return R.ok().add(pageResult);
+ return R.ok().add(buildPageRowsUtils.rowsMap(pageResult));
}
@PreAuthorize("hasAuthority('system:user:list')")
@PostMapping("/user/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(userService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(userService.list()));
}
@PreAuthorize("hasAuthority('system:user:list')")
@PostMapping({"/user/many/{ids}", "/users/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(userService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(userService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:user:list')")
@GetMapping("/user/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(userService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(userService.getById(id)));
}
@PreAuthorize("hasAuthority('system:user:save')")
@@ -114,7 +115,7 @@
}
}
- return R.ok("Save Success").add(user);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(user));
}
@PreAuthorize("hasAuthority('system:user:update')")
@@ -171,7 +172,7 @@
}
}
- return R.ok("Update Success").add(user);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(user));
}
@PreAuthorize("hasAuthority('system:user:remove')")
@@ -190,7 +191,7 @@
}
userRoleService.remove(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, userId));
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('system:user:list')")
@@ -204,13 +205,14 @@
userService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getNickname()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('system:user:list')")
@PostMapping("/user/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(userService.list(), User.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(userService.list()), User.class), response);
}
}
+
--
Gitblit v1.9.1