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/WaitPakinController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
index 7f14c47..ffcecf0 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.entity.WaitPakin;
import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.service.*;
+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;
@@ -26,7 +27,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -53,25 +54,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaitPakin, BaseParam> pageParam = new PageParam<>(baseParam, WaitPakin.class);
- return R.ok().add(waitPakinService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<WaitPakin, BaseParam> page = waitPakinService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping("/waitPakin/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waitPakinService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinService.list()));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@PostMapping({"/waitPakin/many/{ids}", "/waitPakins/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waitPakinService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:waitPakin:list')")
@GetMapping("/waitPakin/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waitPakinService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waitPakinService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:waitPakin:save')")
@@ -90,7 +92,7 @@
if (!waitPakinService.save(waitPakin)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(waitPakin);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waitPakin));
}
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@@ -102,7 +104,7 @@
if (!waitPakinService.updateById(waitPakin)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(waitPakin);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waitPakin));
}
@PreAuthorize("hasAuthority('manager:waitPakin:remove')")
@@ -117,7 +119,7 @@
WaitPakin waitPakin = waitPakinService.getById(id);
BasStation isBarcodeSta = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getBarcode, waitPakin.getBarcode())
- ,false
+ .last("LIMIT 1")
);
if (!Cools.isEmpty(isBarcodeSta)){
throw new CoolException("璇ユ潯鐮佸凡琚�"+isBarcodeSta.getStationName()+"绔欑粦瀹�");
@@ -138,13 +140,13 @@
waitPakinService.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:waitPakin:list')")
@PostMapping("/waitPakin/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waitPakinService.list(), WaitPakin.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waitPakinService.list()), WaitPakin.class), response);
}
--
Gitblit v1.9.1