From 82d07d97089bfe91a369d7bddd4ec09245e45923 Mon Sep 17 00:00:00 2001
From: zzw <228544128@qq.com>
Date: 星期三, 07 十月 2026 12:44:35 +0800
Subject: [PATCH] feat: show user extension attributes in list
---
emergency-repair-server/src/main/java/com/emergencyrepair/system/controller/SystemController.java | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/emergency-repair-server/src/main/java/com/emergencyrepair/system/controller/SystemController.java b/emergency-repair-server/src/main/java/com/emergencyrepair/system/controller/SystemController.java
index 1a9e44f..2f1e564 100644
--- a/emergency-repair-server/src/main/java/com/emergencyrepair/system/controller/SystemController.java
+++ b/emergency-repair-server/src/main/java/com/emergencyrepair/system/controller/SystemController.java
@@ -8,6 +8,7 @@
import com.emergencyrepair.business.entity.TeamMajor;
import com.emergencyrepair.common.Result;
import com.emergencyrepair.system.entity.SysMenu;
+import com.emergencyrepair.system.entity.SysErrorLog;
import com.emergencyrepair.system.entity.SysLoginLog;
import com.emergencyrepair.system.entity.SysOperationLog;
import com.emergencyrepair.system.entity.SysRole;
@@ -79,6 +80,17 @@
return Result.ok();
}
+ @GetMapping("/users/{userId}/ext")
+ public Result<Map<String, Object>> userExt(@PathVariable Long userId) {
+ return Result.ok(systemService.userExt(userId));
+ }
+
+ @PutMapping("/users/{userId}/ext")
+ public Result<Void> saveUserExt(@PathVariable Long userId, @RequestBody Requests.UserExtRequest request) {
+ systemService.saveUserExt(userId, request.getEngineeringMajor(), request.getTeamMajor(), request.getResponsibleXNo());
+ return Result.ok();
+ }
+
@PutMapping("/users/roles/batch")
public Result<Void> saveBatchUserRoles(@RequestBody Requests.BatchUserRoleRequest request) {
systemService.saveUserRolesBatch(request.getUserIds(), request.getRoleIds(), request.getMode());
@@ -88,6 +100,17 @@
@GetMapping("/depts")
public Result<List<Map<String, Object>>> depts() {
return Result.ok(systemService.depts());
+ }
+
+ @GetMapping("/depts/{deptId}/ext")
+ public Result<Map<String, Object>> deptExt(@PathVariable Long deptId) {
+ return Result.ok(systemService.deptExt(deptId));
+ }
+
+ @PutMapping("/depts/{deptId}/ext")
+ public Result<Void> saveDeptExt(@PathVariable Long deptId, @RequestBody Requests.DeptExtRequest request) {
+ systemService.saveDeptExt(deptId, request.getResponsibleXNo());
+ return Result.ok();
}
@GetMapping("/login-logs")
@@ -109,6 +132,22 @@
@RequestParam(required = false) String startDate,
@RequestParam(required = false) String endDate) {
return Result.ok(systemService.operationLogPage(current, size, keyword, module, operationType, startDate, endDate));
+ }
+
+ @GetMapping("/error-logs")
+ public Result<Page<SysErrorLog>> errorLogs(@RequestParam(defaultValue = "1") int current,
+ @RequestParam(defaultValue = "20") int size,
+ @RequestParam(required = false) String keyword,
+ @RequestParam(required = false) String module,
+ @RequestParam(required = false) String exceptionType,
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+ return Result.ok(systemService.errorLogPage(current, size, keyword, module, exceptionType, startDate, endDate));
+ }
+
+ @GetMapping("/error-logs/{id}")
+ public Result<SysErrorLog> errorLog(@PathVariable Long id) {
+ return Result.ok(systemService.errorLog(id));
}
@PostMapping("/menu")
@@ -281,22 +320,16 @@
}
@GetMapping("/menu-permissions")
- public Result<Map<String, Object>> menuPermissions(@RequestParam(required = false) Long roleId,
- @RequestParam(required = false) Long tenantId) {
- return Result.ok(systemService.menuPermissions(roleId, tenantId));
+ public Result<Map<String, Object>> menuPermissions(@RequestParam(required = false) Long roleId) {
+ return Result.ok(systemService.menuPermissions(roleId));
}
@PostMapping("/menu-permissions")
public Result<Void> saveMenuPermissions(@RequestBody Requests.MenuPermissionRequest request) {
- systemService.saveMenuPermissions(request.getRoleId(), request.getTenantId(),
- request.getRoleMenuIds(), request.getTenantMenuIds());
+ systemService.saveMenuPermissions(request.getRoleId(), request.getRoleMenuIds());
return Result.ok();
}
- @GetMapping("/tenants")
- public Result<List<Map<String, Object>>> tenants() {
- return Result.ok(systemService.tenants());
- }
@GetMapping("/three-member")
public Result<Map<String, Object>> threeMember() {
--
Gitblit v1.9.1