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/DeviceSiteController.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
index 8f1c9d8..e6768df 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.controller.params.DeviceSiteParame;
import com.vincent.rsf.server.manager.entity.DeviceSite;
import com.vincent.rsf.server.manager.service.DeviceSiteService;
+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;
@@ -41,7 +42,8 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
- return R.ok().add(deviceSiteService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<DeviceSite, BaseParam> page = deviceSiteService.page(pageParam, pageParam.buildWrapper(true));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
@@ -54,25 +56,25 @@
map.entrySet().removeIf(next -> next.getKey().equals("type"));
}
List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
- return R.ok().add(list);
+ return R.ok().add(buildPageRowsUtils.rowsMap(list));
}
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
@PostMapping("/deviceSite/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(deviceSiteService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(deviceSiteService.list()));
}
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
@PostMapping({"/deviceSite/many/{ids}", "/deviceSites/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(deviceSiteService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(deviceSiteService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
@GetMapping("/deviceSite/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(deviceSiteService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(deviceSiteService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:deviceSite:save')")
@@ -86,7 +88,7 @@
if (!deviceSiteService.save(deviceSite)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(deviceSite);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(deviceSite));
}
@PreAuthorize("hasAuthority('manager:deviceSite:update')")
@@ -98,7 +100,7 @@
if (!deviceSiteService.updateById(deviceSite)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(deviceSite);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(deviceSite));
}
@PreAuthorize("hasAuthority('manager:deviceSite:remove')")
@@ -108,7 +110,7 @@
if (!deviceSiteService.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:deviceSite:list')")
@@ -122,13 +124,13 @@
deviceSiteService.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:deviceSite:list')")
@PostMapping("/deviceSite/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(deviceSiteService.list(), DeviceSite.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(deviceSiteService.list()), DeviceSite.class), response);
}
@PreAuthorize("hasAuthority('manager:deviceSite:save')")
--
Gitblit v1.9.1