From 3eda4de769e0852dd051182efe74c2a49865fa84 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 06 六月 2022 18:46:32 +0800
Subject: [PATCH] 灯杆倾斜处理
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 72dd5b3..e68119d 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
@@ -71,11 +71,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,11 +92,14 @@
}
@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);
}
@@ -112,7 +118,6 @@
/**
* 鍦ㄧ嚎鏁伴噺
*/
- @AnonymousAccess
@GetMapping("/online")
public ResponseVO<Object> online() {
return ResponseUtil.success(poleService.poleCount());
@@ -141,7 +146,6 @@
return ResponseUtil.success(poleService.poleReset(poleId));
}
-//TODO 璁惧鐨勭粦瀹氳В缁戦兘瑕佸崟鐙噸鏂板鐞�
/**
* 鐏潌缁戝畾璁惧
@@ -293,7 +297,6 @@
/**
* 鏌ョ湅鐏潌缁戝畾鐨勮澶�
*/
- @AnonymousAccess
@PostMapping("/getPoleBindDevice/{poleId}")
public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.GET_POLE_BINDING.getCode())) {
@@ -306,7 +309,6 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌璇虹摝
*/
- @AnonymousAccess
@GetMapping("/pushAidDataToNova/{poleId}")
public ResponseVO<Object> pushAirDataToNova(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_NOVA.getCode())) {
@@ -318,7 +320,6 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌鐔欒
*/
- @AnonymousAccess
@GetMapping("/pushAirDataToXiXun/{poleId}")
public ResponseVO<Object> pushAirDataToXiXun(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_XIXUN.getCode())) {
--
Gitblit v1.9.3