From 6b1d4ddbd39dc957a715975611d1461b0af729ab Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 07 一月 2022 10:25:11 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index bf7a5df..c96fec9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -5,7 +5,9 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindingParam;
@@ -47,7 +49,8 @@
}
@GetMapping("/list")
- public ResponseVO<Object> listPole(@RequestParam String keyword) {
+ public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class);
if (StrUtil.isNotBlank(keyword)) {
wrapper.like(Pole::getPoleCode, keyword)
@@ -56,20 +59,21 @@
});
}
List<Pole> list = poleService.list(wrapper);
- return ResponseUtil.success(list);
+ return ResponseUtil.successPage(list);
}
@GetMapping("listPoleAndState")
- public ResponseVO<Object> listPoleAndState() {
-
- return ResponseUtil.success(poleService.queryStatesAndList());
+ public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return ResponseUtil.successPage(poles);
}
/**
* 璁剧疆涓夊厓鐮�
*/
- @PostMapping("/setMac")
+ @PostMapping("/setMac/{poleId}")
public ResponseVO<Object> setMac(@PathVariable Long poleId) {
return ResponseUtil.success(poleService.setMac(poleId));
}
@@ -77,7 +81,7 @@
/**
* 鎭㈠鐏潌鍑哄巶璁剧疆
*/
- @PostMapping("/poleReset")
+ @PostMapping("/poleReset/{poleId}")
public ResponseVO<Object> poleReset(@PathVariable Long poleId) {
return ResponseUtil.success(poleService.poleReset(poleId));
}
--
Gitblit v1.9.3