From f27309d45c7ef46b0aea98107b67d0c5b46d4217 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 10:00:26 +0800
Subject: [PATCH] fix: remove broken duplicate page return
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 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 0dd3457..123127a 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,25 +42,22 @@
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));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
- @PostMapping("/selectStaList/page")
+ @PostMapping("/selectStaList/list")
public R selectStaList(@RequestBody Map<String, Object> map) {
List<String> longs = null;
if (map.get("type") != null) {
longs = JSONArray.parseArray(map.get("type").toString(), String.class);
map.entrySet().removeIf(next -> next.getKey().equals("type"));
}
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<DeviceSite, BaseParam> pageParam = new PageParam<>(baseParam, DeviceSite.class);
-
- QueryWrapper<DeviceSite> queryWrapper = pageParam.buildWrapper(true);
- queryWrapper.lambda().in(DeviceSite::getType, longs);
- PageParam<DeviceSite, BaseParam> page = deviceSiteService.page(pageParam, queryWrapper);
- return R.ok().add(page );
+ List<DeviceSite> list = deviceSiteService.list(new LambdaQueryWrapper<DeviceSite>().in(DeviceSite::getType, longs));
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:deviceSite:list')")
@@ -133,7 +135,7 @@
}
@PreAuthorize("hasAuthority('manager:deviceSite:save')")
- @ApiOperation("绔欑偣鍒濆鍖�")
+ @ApiOperation("璺緞鍒濆鍖�")
@PostMapping("/deviceSite/init")
public R initDeviceSite(@RequestBody DeviceSiteParame param) {
if (Objects.isNull(param)) {
--
Gitblit v1.9.1