From dadc7e65322eb58032b09d7a87d428c280856fd5 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 三月 2022 11:49:45 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java | 121 ++++++++++++++++++++++++++++++++-------
1 files changed, 98 insertions(+), 23 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 89361b4..4e046de 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
@@ -2,23 +2,25 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ArrayUtil;
-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.CommonPage;
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.PoleBindParam;
import com.sandu.ximon.admin.param.PoleBindingParam;
import com.sandu.ximon.admin.param.PoleParam;
+import com.sandu.ximon.admin.param.PoleStatesParam;
+import com.sandu.ximon.admin.service.AirEquipmentService;
+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.dao.domain.Pole;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
/**
@@ -32,6 +34,9 @@
public class PoleController {
private final PoleService poleService;
+ private MonitorService monitorService;
+ private IpVolumeService broadcastTerminalV2Service;
+ private AirEquipmentService airEquipmentService;
@PostMapping("/add")
public ResponseVO<Object> addPole(@RequestBody @Validated PoleParam param) {
@@ -48,25 +53,26 @@
return ResponseUtil.success(poleService.deletePole(poleId));
}
- @GetMapping("/list")
- public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ @PostMapping("/list")
+ public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- LambdaQueryWrapper<Pole> wrapper = Wrappers.lambdaQuery(Pole.class).orderByDesc(Pole::getId);
- if (StrUtil.isNotBlank(keyword)) {
- wrapper.like(Pole::getPoleCode, keyword)
- .or(lampPostLambdaQueryWrapper -> {
- lampPostLambdaQueryWrapper.like(Pole::getPoleName, keyword);
- });
+ 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());
}
- List<Pole> list = poleService.list(wrapper);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(commonPage);
+ // return ResponseUtil.success(poles);
}
- @GetMapping("listPoleAndState")
- public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ @GetMapping("/listPoleAndState")
+ public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
+ @RequestParam(value = "groupid", required = false) Long groupid) {
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-
- List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<Pole> poles = poleService.queryStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),keyword,groupid);
return ResponseUtil.successPage(poles);
}
@@ -76,9 +82,9 @@
*/
@PostMapping("/setMac/{baseMac}")
public ResponseVO<Object> setMac(@PathVariable String baseMac) {
- //public ResponseVO<Object> setMac() {
+ //public ResponseVO<Object> setMac() {
return ResponseUtil.success(poleService.setMac(baseMac));
- // return ResponseUtil.success(poleService.setMac());
+ // return ResponseUtil.success(poleService.setMac());
}
/**
@@ -89,6 +95,7 @@
return ResponseUtil.success(poleService.poleReset(poleId));
}
+//TODO 璁惧鐨勭粦瀹氳В缁戦兘瑕佸崟鐙噸鏂板鐞�
/**
* 鐏潌缁戝畾璁惧
@@ -97,9 +104,78 @@
public ResponseVO<Object> bindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
boolean result = poleService.bindPole(poleId, param);
if (result) {
+ //璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�
+ switch (param.getDeviceType()) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ break;
+ case 3:
+ break;
+ case 4:
+ break;
+ case 5:
+ broadcastTerminalV2Service.updateBingdingState(true, Integer.valueOf(param.getDeviceCode()).intValue());
+ break;
+ case 6:
+ break;
+ case 7:
+ monitorService.updateBingdingState(true, param.getDeviceCode());
+ break;
+ case 8:
+ break;
+ case 9:
+ break;
+ default:
+ break;
+ }
+
return ResponseUtil.success("缁戝畾鎴愬姛");
} else {
return ResponseUtil.fail("缁戝畾澶辫触");
+ }
+ }
+
+ /**
+ * 鐏潌缁戝畾璁惧
+ */
+ @PostMapping("/unBind/{poleId}")
+ public ResponseVO<Object> unBindPole(@PathVariable Long poleId, @RequestBody @Validated PoleBindingParam param) {
+ boolean result = poleService.unBindPole(poleId, param.getDeviceCode());
+ if (result) {
+ //璁惧绫诲瀷锛�0璺伅锛�1led灞忓箷锛�2鍏呯數妗╋紝3澶ф皵鐩戞祴锛�4姘磋川鐩戞祴锛�5ip闊虫煴锛�6lcd骞垮憡鏈猴紝7鎽勫儚澶达紝8鏉嗕綋鍊炬祴锛�9涓�閿晳鍔�
+ switch (param.getDeviceType()) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ break;
+ case 3:
+ break;
+ case 4:
+ break;
+ case 5:
+ broadcastTerminalV2Service.updateBingdingState(false, Integer.valueOf(param.getDeviceCode()).intValue());
+ break;
+ case 6:
+ break;
+ case 7:
+ monitorService.updateBingdingState(false, param.getDeviceCode());
+ break;
+ case 8:
+ break;
+ case 9:
+ break;
+ default:
+ break;
+ }
+
+ return ResponseUtil.success("瑙ｇ粦鎴愬姛");
+ } else {
+ return ResponseUtil.fail("瑙ｇ粦澶辫触");
}
}
@@ -119,9 +195,8 @@
}
@PostMapping("/ClientBindingPole")
- public ResponseVO<Object> ClientBindingPole(@RequestBody long clientId, @RequestBody int[] poleIds) {
-
- return ResponseUtil.success(poleService.ClientBindingPole(clientId, poleIds));//////////////
+ public ResponseVO<Object> ClientBindingPole(@RequestBody PoleBindParam param) {
+ return ResponseUtil.success(poleService.ClientBindingPole(param.getClientId(), param.getPoleIds()));//////////////
}
--
Gitblit v1.9.3