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/DeviceSiteController.java |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 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 4770997..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,19 +15,24 @@
 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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
-@Api(tags = "绔欑偣绠＄悊")
+@Api(tags = "璺緞绠＄悊")
 public class DeviceSiteController extends BaseController {
+
+    private static final Logger log = LoggerFactory.getLogger(DeviceSiteController.class);
 
     @Autowired
     private DeviceSiteService deviceSiteService;
@@ -37,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));
     }
 
 
@@ -50,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')")
@@ -82,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')")
@@ -94,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')")
@@ -104,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')")
@@ -118,17 +124,17 @@
         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')")
-    @ApiOperation("绔欑偣鍒濆鍖�")
+    @ApiOperation("璺緞鍒濆鍖�")
     @PostMapping("/deviceSite/init")
     public R initDeviceSite(@RequestBody DeviceSiteParame param) {
         if (Objects.isNull(param)) {

--
Gitblit v1.9.1