From a488088a18a9b8808bc57124681cee8c4ada7299 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 17:23:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeviceSiteController.java | 19 +++++++++----------
1 files changed, 9 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 0dd3457..e57c73f 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
@@ -18,6 +18,8 @@
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.*;
@@ -26,8 +28,10 @@
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;
@@ -42,20 +46,15 @@
@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 +132,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