From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 71 ++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 27 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 a7665aa..058ce00 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
@@ -19,6 +19,7 @@
import com.sandu.ximon.admin.service.IpVolumeService;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.admin.vo.PoleBindVO;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.MenuEnum;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
@@ -26,6 +27,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -68,24 +70,41 @@
return ResponseUtil.success(poleService.deletePole(poleId));
}
- @PostMapping("/list")
- public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
+ @PostMapping("/listDetail")
+ 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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<Pole> results = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
- CommonPage commonPage = CommonPage.restPage(results);
- int size = results.size();
- commonPage.setTotal((long) size);
- commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
- if (size % baseConditionVO.getPageSize() == 0) {
- commonPage.setTotalPage(size / baseConditionVO.getPageSize());
+ CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param, order, seq);
+ List<Pole> listCommonPage = (List<Pole>) commonPage.getList();
+
+ List<PoleBindVO> listResult = new ArrayList<>();
+ for (Pole pole : listCommonPage) {
+ PoleBindVO bindByPoleId = poleService.getBindByPoleId(pole.getId());
+ bindByPoleId.setPole(pole);
+ listResult.add(bindByPoleId);
}
+ commonPage.setList(listResult);
return ResponseUtil.success(commonPage);
- // return ResponseUtil.success(poles);
}
+ @PostMapping("/list")
+ 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, 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) {
@@ -100,7 +119,6 @@
/**
* 鍦ㄧ嚎鏁伴噺
*/
- @AnonymousAccess
@GetMapping("/online")
public ResponseVO<Object> online() {
return ResponseUtil.success(poleService.poleCount());
@@ -110,26 +128,27 @@
/**
* 璁剧疆涓夊厓鐮�
*/
+ @AnonymousAccess
@PostMapping("/setMac/{baseMac}")
public ResponseVO<Object> setMac(@PathVariable String baseMac) {
- if (!permissionConfig.check(MenuEnum.POLE_REAL_ADD.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
+// if (!permissionConfig.check(MenuEnum.POLE_REAL_ADD.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
return ResponseUtil.success(poleService.setMac(baseMac));
}
/**
* 鎭㈠鐏潌鍑哄巶璁剧疆
*/
+ @AnonymousAccess
@PostMapping("/poleReset/{poleId}")
public ResponseVO<Object> poleReset(@PathVariable Long poleId) {
- if (!permissionConfig.check(MenuEnum.POLE_REAL_RESET.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
+// if (!permissionConfig.check(MenuEnum.POLE_REAL_RESET.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
return ResponseUtil.success(poleService.poleReset(poleId));
}
-//TODO 璁惧鐨勭粦瀹氳В缁戦兘瑕佸崟鐙噸鏂板鐞�
/**
* 鐏潌缁戝畾璁惧
@@ -186,7 +205,7 @@
}
/**
- * 鐏潌缁戝畾璁惧
+ * 鐏潌瑙ｇ粦璁惧
*/
@PostMapping("/unBind/{poleId}")
public ResponseVO<Object> unBindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
@@ -238,11 +257,12 @@
}
}
+ @AnonymousAccess
@PostMapping("/listStatusByDeviceCode")
public ResponseVO<Object> getStatusById(@RequestBody String[] deviceCodeList) {
- if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
+// if (!permissionConfig.check(MenuEnum.GET_STATE_BY_DEVICECODE.getCode())) {
+// return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+// }
for (String s : deviceCodeList) {
if (s == null) {
return ResponseUtil.fail("鍙傛暟涓嶈兘涓虹┖");
@@ -279,9 +299,8 @@
}
/**
- * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
+ * 鏌ョ湅鐏潌缁戝畾鐨勮澶� //宸插悎骞跺埌鍒楄〃鍔熻兘 姝ゆ帴鍙ｅ凡搴熷純
*/
- @AnonymousAccess
@PostMapping("/getPoleBindDevice/{poleId}")
public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.GET_POLE_BINDING.getCode())) {
@@ -294,7 +313,6 @@
/**
* 鎺ㄩ�佸ぇ姘旇澶囧埌璇虹摝
*/
- @AnonymousAccess
@GetMapping("/pushAidDataToNova/{poleId}")
public ResponseVO<Object> pushAirDataToNova(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.PUSH_AIR_DATA_TO_NOVA.getCode())) {
@@ -306,7 +324,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