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/DeliveryController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
index eb9a3c1..0caed2d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java
@@ -23,6 +23,7 @@
import com.vincent.rsf.server.manager.service.DeliveryItemService;
import com.vincent.rsf.server.manager.service.DeliveryService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.SerialRuleService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
@@ -49,25 +50,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Delivery, BaseParam> pageParam = new PageParam<>(baseParam, Delivery.class);
- return R.ok().add(deliveryService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Delivery, BaseParam> page = deliveryService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:delivery:list')")
@PostMapping("/delivery/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(deliveryService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(deliveryService.list()));
}
@PreAuthorize("hasAuthority('manager:delivery:list')")
@PostMapping({"/delivery/many/{ids}", "/deliverys/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(deliveryService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(deliveryService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:delivery:list')")
@GetMapping("/delivery/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(deliveryService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(deliveryService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:delivery:save')")
@@ -86,7 +88,7 @@
if (!deliveryService.save(delivery)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(delivery);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(delivery));
}
@PreAuthorize("hasAuthority('manager:delivery:update')")
@@ -105,7 +107,7 @@
if (!deliveryService.updateById(delivery)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(delivery);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(delivery));
}
@PreAuthorize("hasAuthority('manager:delivery:remove')")
@@ -116,7 +118,7 @@
if (list.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("鎿嶄綔鎴愬姛").add(deliveryService.removeDo(list));
+ return R.ok("鎿嶄綔鎴愬姛").add(buildPageRowsUtils.rowsMap(deliveryService.removeDo(list)));
}
@PreAuthorize("hasAuthority('manager:delivery:list')")
@@ -130,7 +132,7 @@
deliveryService.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:delivery:list')")
@@ -172,7 +174,7 @@
orderTemplates.add(template);
}
}
- ExcelUtil.build(ExcelUtil.create(orderTemplates, DeliveryTemplate.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(orderTemplates), DeliveryTemplate.class), response);
}
@PostMapping("/delivery/import")
@@ -183,7 +185,7 @@
return R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
Map<String, Object> hashMap = new HashMap<>();
- return R.ok("瀵煎叆鎴愬姛").add(deliveryItemService.excelImport(file, hashMap, getLoginUserId()));
+ return R.ok("瀵煎叆鎴愬姛").add(buildPageRowsUtils.rowsMap(deliveryItemService.excelImport(file, hashMap, getLoginUserId())));
}
--
Gitblit v1.9.1