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/manager/controller/ContainerController.java | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 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..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
@@ -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,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')")
@@ -56,13 +59,17 @@
@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");
}
- return R.ok("Save Success").add(container);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(container));
}
@PreAuthorize("hasAuthority('manager:container:update')")
@@ -74,17 +81,21 @@
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')")
@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");
}
- return R.ok("Delete Success").add(ids);
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:container:list')")
@@ -98,13 +109,19 @@
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')")
@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(buildPageRowsUtils.rowsMap(containers), Container.class), response);
}
}
--
Gitblit v1.9.1