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/StockController.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
index b32b8ba..ad374eb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockController.java
@@ -11,14 +11,17 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Stock;
import com.vincent.rsf.server.manager.service.StockService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
+import io.swagger.annotations.Api;
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.*;
+@Api(tags = "搴撳瓨淇℃伅")
@RestController
public class StockController extends BaseController {
@@ -30,25 +33,35 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Stock, BaseParam> pageParam = new PageParam<>(baseParam, Stock.class);
- return R.ok().add(stockService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Stock, BaseParam> page = stockService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
+ }
+
+ @PreAuthorize("hasAuthority('manager:stock:list')")
+ @PostMapping("/inStock/num/page")
+ public R inStockpage(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<Stock, BaseParam> pageParam = new PageParam<>(baseParam, Stock.class);
+ PageParam<Stock, BaseParam> page = stockService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stock/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(stockService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockService.list()));
}
@PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping({"/stock/many/{ids}", "/stocks/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(stockService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:stock:list')")
@GetMapping("/stock/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(stockService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:stock:save')")
@@ -62,7 +75,7 @@
if (!stockService.save(stock)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(stock);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(stock));
}
@PreAuthorize("hasAuthority('manager:stock:update')")
@@ -74,7 +87,7 @@
if (!stockService.updateById(stock)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(stock);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(stock));
}
@PreAuthorize("hasAuthority('manager:stock:remove')")
@@ -84,7 +97,7 @@
if (!stockService.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:stock:list')")
@@ -98,13 +111,13 @@
stockService.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:stock:list')")
@PostMapping("/stock/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(stockService.list(), Stock.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(stockService.list()), Stock.class), response);
}
}
--
Gitblit v1.9.1