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/BasContainerController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index b910240..e9f216f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.entity.WarehouseAreas;
import com.vincent.rsf.server.manager.service.BasContainerService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.BeanWrapperImpl;
@@ -45,19 +46,19 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<BasContainer, BaseParam> pageParam = new PageParam<>(baseParam, BasContainer.class);
PageParam<BasContainer, BaseParam> page = basContainerService.page(pageParam, pageParam.buildWrapper(true));
- return R.ok().add(page);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:basContainer:list')")
@PostMapping("/basContainer/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(basContainerService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(basContainerService.list()));
}
@PreAuthorize("hasAuthority('manager:basContainer:list')")
@PostMapping({"/basContainer/many/{ids}", "/basContainers/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(basContainerService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(basContainerService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:basContainer:list')")
@@ -68,7 +69,7 @@
if (basContainer != null) {
basContainer.sortAreas();
}
- return R.ok().add(basContainer);
+ return R.ok().add(buildPageRowsUtils.rowsMap(basContainer));
}
@PreAuthorize("hasAuthority('manager:basContainer:save')")
@@ -90,7 +91,7 @@
if (!basContainerService.save(basContainer)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(basContainer);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(basContainer));
}
@PreAuthorize("hasAuthority('manager:basContainer:update')")
@@ -106,7 +107,7 @@
if (!basContainerService.updateById(basContainer)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(basContainer);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(basContainer));
}
@PreAuthorize("hasAuthority('manager:basContainer:remove')")
@@ -116,7 +117,7 @@
if (!basContainerService.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:basContainer:list')")
@@ -130,7 +131,7 @@
basContainerService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:basContainer:list')")
--
Gitblit v1.9.1