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/DeliveryItemController.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
index 1db8047..ed90faf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
@@ -49,8 +49,7 @@
PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, wrapper);
- buildPageRowsUtils.userNameMap(page.getRecords());
- return R.ok().add(page);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@@ -61,8 +60,7 @@
QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
wrapper.apply("anfme > work_qty + qty ");
PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, wrapper);
- buildPageRowsUtils.userNameMap(page.getRecords());
- return R.ok().add(page);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@@ -84,8 +82,7 @@
return R.ok();
}
PageParam<DeliveryItem, BaseParam> page = deliveryItemService.page(pageParam, queryWrapper);
- buildPageRowsUtils.userNameMap(page.getRecords());
- return R.ok().add(page);
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@@ -93,19 +90,19 @@
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@PostMapping("/deliveryItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(deliveryItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(deliveryItemService.list()));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@PostMapping({"/deliveryItem/many/{ids}", "/deliveryItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(deliveryItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(deliveryItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@GetMapping("/deliveryItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(deliveryItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(deliveryItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:save')")
@@ -123,7 +120,7 @@
if (!deliveryItemService.save(deliveryItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(deliveryItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(deliveryItem));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:update')")
@@ -135,7 +132,7 @@
if (!deliveryItemService.updateById(deliveryItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(deliveryItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(deliveryItem));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:remove')")
@@ -145,7 +142,7 @@
if (!deliveryItemService.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:deliveryItem:list')")
@@ -159,6 +156,6 @@
deliveryItemService.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));
}
}
--
Gitblit v1.9.1