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/TenantController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java
index 8c0639d..2862518 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/controller/TenantController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.framework.common.BaseRes;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.common.annotation.OperationLog;
@@ -9,13 +10,15 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
+import com.vincent.rsf.server.system.controller.param.TenantInitParam;
import com.vincent.rsf.server.system.entity.Tenant;
import com.vincent.rsf.server.system.service.TenantService;
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
@@ -29,25 +32,25 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Tenant, BaseParam> pageParam = new PageParam<>(baseParam, Tenant.class);
- return R.ok().add(tenantService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.page(pageParam, pageParam.buildWrapper(true))));
}
@PreAuthorize("hasAuthority('system:tenant:list')")
@PostMapping("/tenant/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(tenantService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.list()));
}
@PreAuthorize("hasAuthority('system:tenant:list')")
@PostMapping({"/tenant/many/{ids}", "/tenants/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(tenantService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('system:tenant:list')")
@GetMapping("/tenant/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(tenantService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(tenantService.getById(id)));
}
@PreAuthorize("hasAuthority('system:tenant:save')")
@@ -59,7 +62,14 @@
if (!tenantService.save(tenant)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(tenant);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(tenant));
+ }
+
+ @PreAuthorize("hasAuthority('system:tenant:save')")
+ @OperationLog("Init Tenant")
+ @PostMapping("/tenant/init")
+ public R init(@RequestBody TenantInitParam param) {
+ return null != tenantService.initTenant(param) ? R.ok("Initialize Success") : R.parse(BaseRes.PARAM);
}
@PreAuthorize("hasAuthority('system:tenant:update')")
@@ -70,7 +80,7 @@
if (!tenantService.updateById(tenant)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(tenant);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(tenant));
}
@PreAuthorize("hasAuthority('system:tenant:remove')")
@@ -80,7 +90,7 @@
if (!tenantService.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:tenant:list')")
@@ -94,13 +104,14 @@
tenantService.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('system:tenant:list')")
@PostMapping("/tenant/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(tenantService.list(), Tenant.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(tenantService.list()), Tenant.class), response);
}
}
+
--
Gitblit v1.9.1