From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
index 7c93adc..292806a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveItemController.java
@@ -13,13 +13,14 @@
import com.vincent.rsf.server.manager.entity.WaveItem;
import com.vincent.rsf.server.manager.enums.WaveItemExceStatus;
import com.vincent.rsf.server.manager.service.WaveItemService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.ApiOperation;
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.*;
@RestController
@@ -33,25 +34,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WaveItem, BaseParam> pageParam = new PageParam<>(baseParam, WaveItem.class);
- return R.ok().add(waveItemService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<WaveItem, BaseParam> page = waveItemService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:waveItem:list')")
@PostMapping("/waveItem/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waveItemService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveItemService.list()));
}
@PreAuthorize("hasAuthority('manager:waveItem:list')")
@PostMapping({"/waveItem/many/{ids}", "/waveItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waveItemService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveItemService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:waveItem:list')")
@GetMapping("/waveItem/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waveItemService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveItemService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:waveItem:save')")
@@ -65,7 +67,7 @@
if (!waveItemService.save(waveItem)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(waveItem);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waveItem));
}
@PreAuthorize("hasAuthority('manager:waveItem:update')")
@@ -77,7 +79,7 @@
if (!waveItemService.updateById(waveItem)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(waveItem);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waveItem));
}
@PreAuthorize("hasAuthority('manager:waveItem:remove')")
@@ -87,7 +89,7 @@
if (!waveItemService.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:waveItem:list')")
@@ -101,12 +103,12 @@
waveItemService.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:waveItem:list')")
@PostMapping("/waveItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waveItemService.list(), WaveItem.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waveItemService.list()), WaveItem.class), response);
}
}
--
Gitblit v1.9.1