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/WarehouseController.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
index e14b884..4b25fb6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java
@@ -12,9 +12,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.entity.WarehouseAreas;
+import com.vincent.rsf.server.manager.entity.vo.WarehouseVO;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.WarehouseService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,8 +24,9 @@
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.*;
+import java.util.stream.Collectors;
@Api(tags = "浠撳簱")
@RestController
@@ -43,25 +46,40 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Warehouse, BaseParam> pageParam = new PageParam<>(baseParam, Warehouse.class);
- return R.ok().add(warehouseService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Warehouse, BaseParam> page = warehouseService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:warehouse:list')")
@PostMapping("/warehouse/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(warehouseService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseService.list()));
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouse:list')")
+ @PostMapping("/warehouse/list2")
+ public R list2(@RequestBody Map<String, Object> map) {
+ List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().select(Warehouse::getId,Warehouse::getName));
+
+ List<WarehouseVO> warehouseList2 = warehouseList.stream().map(warehouse -> {
+ WarehouseVO vo = new WarehouseVO();
+ vo.setId(warehouse.getId());
+ vo.setName(warehouse.getName());
+ return vo;
+ }).collect(Collectors.toList());
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseList2));
}
@PreAuthorize("hasAuthority('manager:warehouse:list')")
@PostMapping({"/warehouse/many/{ids}", "/warehouses/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(warehouseService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:warehouse:list')")
@GetMapping("/warehouse/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(warehouseService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(warehouseService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:warehouse:save')")
@@ -87,7 +105,7 @@
if (!warehouseService.save(warehouse)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(warehouse);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(warehouse));
}
@PreAuthorize("hasAuthority('manager:warehouse:update')")
@@ -116,10 +134,11 @@
}
}
+ warehouse.setUpdateTime(new Date());
if (!warehouseService.updateById(warehouse)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(warehouse);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(warehouse));
}
@PreAuthorize("hasAuthority('manager:warehouse:remove')")
@@ -137,7 +156,7 @@
if (!warehouseService.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:warehouse:list')")
@@ -151,7 +170,7 @@
warehouseService.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:warehouse:list')")
@@ -163,7 +182,7 @@
} else {
list = warehouseService.list();
}
- ExcelUtil.build(ExcelUtil.create(list, Warehouse.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(list), Warehouse.class), response);
}
@ApiOperation("鑾峰彇浠撳簱鏍戠姸鍥�")
--
Gitblit v1.9.1