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/LocItemDeadController.java |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java
index 9dae6b5..7c67a79 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemDeadController.java
@@ -18,13 +18,14 @@
 import com.vincent.rsf.server.manager.enums.TaskResouceType;
 import com.vincent.rsf.server.manager.service.LocItemService;
 import com.vincent.rsf.server.manager.service.LocService;
+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
@@ -52,7 +53,7 @@
         }
         page.setRecords(records);
 
-        return R.ok().add(page);
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
     @PreAuthorize("hasAuthority('manager:statisticReport:list')")
@@ -80,7 +81,7 @@
         }
         page.setRecords(records);
 
-        return R.ok().add(page);
+        return R.ok().add(buildPageRowsUtils.rowsMap(page));
     }
 
     /**
@@ -116,7 +117,7 @@
         if (Objects.isNull(map)) {
             return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
         }
-        return R.ok("浠诲姟鐢熸垚鎴愬姛").add(locItemService.genMoveTask(map, getLoginUserId()));
+        return R.ok("浠诲姟鐢熸垚鎴愬姛").add(buildPageRowsUtils.rowsMap(locItemService.genMoveTask(map, getLoginUserId())));
     }
 
     /**
@@ -146,19 +147,19 @@
     @PreAuthorize("hasAuthority('manager:statisticReport:list')")
     @PostMapping("/locDeadReport/list")
     public R list(@RequestBody Map<String, Object> map) {
-        return R.ok().add(locItemService.list());
+        return R.ok().add(buildPageRowsUtils.rowsMap(locItemService.list()));
     }
 
     @PreAuthorize("hasAuthority('manager:statisticReport:list')")
     @PostMapping({"/locDeadReport/many/{ids}", "/locDeadReport/many/{ids}"})
     public R many(@PathVariable Long[] ids) {
-        return R.ok().add(locItemService.listByIds(Arrays.asList(ids)));
+        return R.ok().add(buildPageRowsUtils.rowsMap(locItemService.listByIds(Arrays.asList(ids))));
     }
 
     @PreAuthorize("hasAuthority('manager:statisticReport:list')")
     @GetMapping("/locDeadReport/{id}")
     public R get(@PathVariable("id") Long id) {
-        return R.ok().add(locItemService.getById(id));
+        return R.ok().add(buildPageRowsUtils.rowsMap(locItemService.getById(id)));
     }
 
     @PreAuthorize("hasAuthority('manager:statisticReport:save')")
@@ -172,7 +173,7 @@
         if (!locItemService.save(locItem)) {
             return R.error("Save Fail");
         }
-        return R.ok("Save Success").add(locItem);
+        return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(locItem));
     }
 
     @PreAuthorize("hasAuthority('manager:statisticReport:update')")
@@ -184,7 +185,7 @@
         if (!locItemService.updateById(locItem)) {
             return R.error("Update Fail");
         }
-        return R.ok("Update Success").add(locItem);
+        return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(locItem));
     }
 
     @PreAuthorize("hasAuthority('manager:statisticReport:remove')")
@@ -194,7 +195,7 @@
         if (!locItemService.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:statisticReport:list')")
@@ -208,13 +209,13 @@
         locItemService.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:statisticReport:list')")
     @PostMapping("/locDeadReport/export")
     public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
-        ExcelUtil.build(ExcelUtil.create(locItemService.list(), LocItem.class), response);
+        ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(locItemService.list()), LocItem.class), response);
     }
 
 }

--
Gitblit v1.9.1