From 3075910e10bb60fa2775afb4dbad8d5dba488abb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 09:56:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 20 +++++++++++++-------
1 files changed, 13 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 ace0d00..881bef7 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
@@ -7,7 +7,6 @@
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.DeviceStatus;
import com.sandu.ximon.admin.param.PoleBindParam;
@@ -71,11 +70,14 @@
}
@PostMapping("/listDetail")
- public ResponseVO<Object> listPoleDetail(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
+ public ResponseVO<Object> listPoleDetail(BaseConditionVO baseConditionVO,
+ @RequestBody PoleStatesParam param,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
+ CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);
List<Pole> listCommonPage = (List<Pole>) commonPage.getList();
List<PoleBindVO> listResult = new ArrayList<>();
@@ -89,15 +91,19 @@
}
@PostMapping("/list")
- public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
+ public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO,
+ @RequestBody PoleStatesParam param,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq) {
if (!permissionConfig.check(MenuEnum.POLE_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
+ CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);
return ResponseUtil.success(commonPage);
}
+ //宸插惎鐢�
@GetMapping("/listPoleAndState")
public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "groupid", required = false) Long groupid) {
@@ -196,7 +202,7 @@
}
/**
- * 鐏潌缁戝畾璁惧
+ * 鐏潌瑙ｇ粦璁惧
*/
@PostMapping("/unBind/{poleId}")
public ResponseVO<Object> unBindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
@@ -289,7 +295,7 @@
}
/**
- * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
+ * 鏌ョ湅鐏潌缁戝畾鐨勮澶� //宸插悎骞跺埌鍒楄〃鍔熻兘 姝ゆ帴鍙ｅ凡搴熷純
*/
@PostMapping("/getPoleBindDevice/{poleId}")
public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
--
Gitblit v1.9.3