From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
index e546dbf..de688c4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
@@ -11,47 +11,51 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.StockItem;
import com.vincent.rsf.server.manager.service.StockItemService;
+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 StockItemController extends BaseController {
@Autowired
private StockItemService stockItemService;
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockItem, BaseParam> pageParam = new PageParam<>(baseParam, StockItem.class);
- return R.ok().add(stockItemService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<StockItem, BaseParam> page = stockItemService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(stockItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockItemService.list()));
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping({"/stockItem/many/{ids}", "/stockItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(stockItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockItemService.listByIds(Arrays.asList(ids))));
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@GetMapping("/stockItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(stockItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(stockItemService.getById(id)));
}
- @PreAuthorize("hasAuthority('manager:stockItem:save')")
+ @PreAuthorize("hasAuthority('manager:stock:save')")
@OperationLog("Create 搴撳瓨鏄庣粏琛�")
@PostMapping("/stockItem/save")
public R save(@RequestBody StockItem stockItem) {
@@ -62,10 +66,10 @@
if (!stockItemService.save(stockItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(stockItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(stockItem));
}
- @PreAuthorize("hasAuthority('manager:stockItem:update')")
+ @PreAuthorize("hasAuthority('manager:stock:update')")
@OperationLog("Update 搴撳瓨鏄庣粏琛�")
@PostMapping("/stockItem/update")
public R update(@RequestBody StockItem stockItem) {
@@ -74,37 +78,37 @@
if (!stockItemService.updateById(stockItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(stockItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(stockItem));
}
- @PreAuthorize("hasAuthority('manager:stockItem:remove')")
+ @PreAuthorize("hasAuthority('manager:stock:remove')")
@OperationLog("Delete 搴撳瓨鏄庣粏琛�")
@PostMapping("/stockItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
if (!stockItemService.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:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
LambdaQueryWrapper<StockItem> wrapper = new LambdaQueryWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like(StockItem::getMatnrk, condition);
+ wrapper.like(StockItem::getMaktx, condition);
}
stockItemService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
- item -> vos.add(new KeyValVo(item.getId(), item.getMatnrk()))
+ item -> vos.add(new KeyValVo(item.getId(), item.getMaktx()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(stockItemService.list(), StockItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(stockItemService.list()), StockItem.class), response);
}
}
--
Gitblit v1.9.1