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/WaveOrderRelaController.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
index eee2c3a..7cd981d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaveOrderRelaController.java
@@ -1,6 +1,7 @@
package com.vincent.rsf.server.manager.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -15,8 +16,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -25,30 +27,30 @@
@Autowired
private WaveOrderRelaService waveOrderRelaService;
- @PreAuthorize("hasAuthority('manager:waveOrderRela:list')")
+ @PreAuthorize("hasAuthority('manager:waveItem:list')")
@PostMapping("/waveOrderRela/page")
public R page(@RequestBody Map<String, Object> map) {
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<WaveOrderRela, BaseParam> pageParam = new PageParam<>(baseParam, WaveOrderRela.class);
- return R.ok().add(waveOrderRelaService.page(pageParam, pageParam.buildWrapper(true)));
+ Map<String, Object> param = new HashMap<>();
+ BaseParam baseParam = buildParam(param, BaseParam.class);
+ return waveOrderRelaService.relaPage(baseParam, map);
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:list')")
@PostMapping("/waveOrderRela/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(waveOrderRelaService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveOrderRelaService.list()));
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:list')")
@PostMapping({"/waveOrderRela/many/{ids}", "/waveOrderRelas/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(waveOrderRelaService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveOrderRelaService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:list')")
@GetMapping("/waveOrderRela/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(waveOrderRelaService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(waveOrderRelaService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:save')")
@@ -58,7 +60,7 @@
if (!waveOrderRelaService.save(waveOrderRela)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(waveOrderRela);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(waveOrderRela));
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:update')")
@@ -68,7 +70,7 @@
if (!waveOrderRelaService.updateById(waveOrderRela)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(waveOrderRela);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(waveOrderRela));
}
@PreAuthorize("hasAuthority('manager:waveOrderRela:remove')")
@@ -78,7 +80,7 @@
if (!waveOrderRelaService.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:waveOrderRela:list')")
@@ -92,13 +94,13 @@
waveOrderRelaService.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:waveOrderRela:list')")
@PostMapping("/waveOrderRela/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(waveOrderRelaService.list(), WaveOrderRela.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(waveOrderRelaService.list()), WaveOrderRela.class), response);
}
}
--
Gitblit v1.9.1