From a8df4c4a80781c02815021a840971ce4b15419f5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 09:38:24 +0800
Subject: [PATCH] refactor: batch fill page operator names
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/ContainerController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 4c3aff9..71f135f 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -11,12 +12,13 @@
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;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -30,7 +32,9 @@
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));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:container:list')")
@@ -56,9 +60,13 @@
@PostMapping("/container/save")
public R save(@RequestBody Container container) {
container.setCreateBy(getLoginUserId());
- container.setCreateTime(new Date());
container.setUpdateBy(getLoginUserId());
- container.setUpdateTime(new Date());
+ if (Objects.isNull(container.getType())) {
+ throw new CoolException("瀹瑰櫒绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(container.getUsed())) {
+ throw new CoolException("瀹瑰櫒浣跨敤娆℃暟涓嶈兘涓虹┖锛侊紒");
+ }
if (!containerService.save(container)) {
return R.error("Save Fail");
}
@@ -81,6 +89,10 @@
@OperationLog("Delete 搴撲綅淇℃伅琛�")
@PostMapping("/container/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
+ List<Container> containers = containerService.list(new LambdaQueryWrapper<Container>().in(Container::getPanrentId, ids));
+ if (containers.isEmpty()) {
+ throw new CoolException("褰撳墠瀹瑰櫒鏈夊瓙瀹瑰櫒缁戝畾锛屼笉鑳芥墽琛屽垹闄ゆ搷浣滐紒锛�");
+ }
if (!containerService.removeByIds(Arrays.asList(ids))) {
return R.error("Delete Fail");
}
@@ -104,7 +116,13 @@
@PreAuthorize("hasAuthority('manager:container:list')")
@PostMapping("/container/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(containerService.list(), Container.class), response);
+ List<Container> containers = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ containers = containerService.list(new LambdaQueryWrapper<Container>().in(Container::getId, map.get("ids")));
+ } else {
+ containers = containerService.list();
+ }
+ ExcelUtil.build(ExcelUtil.create(containers, Container.class), response);
}
}
--
Gitblit v1.9.1