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/LocAreaController.java | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
index 52b8c9f..08d48e8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocAreaController.java
@@ -12,16 +12,16 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.LocArea;
import com.vincent.rsf.server.manager.service.LocAreaService;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
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.*;
-@Api(tags = "閫昏緫鍒嗗尯")
@RestController
public class LocAreaController extends BaseController {
@@ -33,25 +33,26 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<LocArea, BaseParam> pageParam = new PageParam<>(baseParam, LocArea.class);
- return R.ok().add(locAreaService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<LocArea, BaseParam> page = locAreaService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@PreAuthorize("hasAuthority('manager:locArea:list')")
@PostMapping("/locArea/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(locAreaService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(locAreaService.list()));
}
@PreAuthorize("hasAuthority('manager:locArea:list')")
@PostMapping({"/locArea/many/{ids}", "/locAreas/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(locAreaService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locAreaService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:locArea:list')")
@GetMapping("/locArea/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(locAreaService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(locAreaService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:locArea:save')")
@@ -64,16 +65,13 @@
if (Objects.isNull(locArea.getAreaId())) {
throw new CoolException("搴撳尯涓嶈兘涓虹┖锛侊紒");
}
- if (Objects.isNull(locArea.getLocId())) {
- throw new CoolException("搴撲綅涓嶈兘涓虹┖锛侊紒");
- }
locArea.setCreateBy(getLoginUserId());
locArea.setUpdateBy(getLoginUserId());
if (!locAreaService.save(locArea)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(locArea);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(locArea));
}
@PreAuthorize("hasAuthority('manager:locArea:update')")
@@ -85,7 +83,7 @@
if (!locAreaService.updateById(locArea)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(locArea);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(locArea));
}
@PreAuthorize("hasAuthority('manager:locArea:remove')")
@@ -95,7 +93,7 @@
if (!locAreaService.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:locArea:list')")
@@ -109,13 +107,13 @@
locAreaService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getName()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PreAuthorize("hasAuthority('manager:locArea:list')")
@PostMapping("/locArea/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(locAreaService.list(), LocArea.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locAreaService.list()), LocArea.class), response);
}
}
--
Gitblit v1.9.1